*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+#include <fcntl.h>
-#include "../src/guestfs_protocol.h"
+#include "guestfs_protocol.h"
#include "daemon.h"
#include "actions.h"
static int
-wc (char *flag, char *path)
+wc (const char *flag, const char *path)
{
- char *buf;
char *out, *err;
- int r;
+ int fd, flags, r;
- NEED_ROOT (return -1);
- ABS_PATH (path, return -1);
+ CHROOT_IN;
+ fd = open (path, O_RDONLY);
+ CHROOT_OUT;
- /* Make the path relative to /sysroot. */
- buf = sysroot_path (path);
- if (!buf) {
- reply_with_perror ("malloc");
+ if (fd == -1) {
+ reply_with_perror ("wc %s: %s", flag, path);
return -1;
}
- r = command (&out, &err, "wc", flag, buf, NULL);
- free (buf);
+ flags = COMMAND_FLAG_CHROOT_COPY_FILE_TO_STDIN | fd;
+ r = commandf (&out, &err, flags, "wc", flag, NULL);
if (r == -1) {
reply_with_error ("wc %s: %s", flag, err);
free (out);
/* Parse the number. */
if (sscanf (out, "%d", &r) != 1) {
- reply_with_error ("wc: cannot parse number: %s", out);
+ reply_with_error ("cannot parse number: %s", out);
free (out);
return -1;
}
}
int
-do_wc_l (char *path)
+do_wc_l (const char *path)
{
return wc ("-l", path);
}
int
-do_wc_w (char *path)
+do_wc_w (const char *path)
{
return wc ("-w", path);
}
int
-do_wc_c (char *path)
+do_wc_c (const char *path)
{
return wc ("-c", path);
}