search for: do_ll

per IRC discussion, >From a1d982bf49e166341096902fc4c103d4397ce0e3 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering at redhat.com> Date: Tue, 11 Aug 2009 13:16:27 +0200 Subject: [PATCH libguestfs] daemon/ls: make do_ll require root, like all the rest * ls.c (do_ll): Do invoke "NEED_ROOT" here, and add a FIXME to provide a "debug ll" command with the semantics we're removing. --- daemon/ls.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/daemon/ls....

...we can't chroot and run the ls command (since 'ls' won't - * necessarily exist in the chroot), this command can be used to escape - * from the sysroot (eg. 'll /..'). This command is not meant for - * serious use anyway, just for quick interactive sessions. - */ - char * do_ll (const char *path) { int r; char *out; CLEANUP_FREE char *err = NULL; + CLEANUP_FREE char *rpath = NULL; CLEANUP_FREE char *spath = NULL; - spath = sysroot_path (path); + CHROOT_IN; + rpath = realpath (path, NULL); + CHROOT_OUT; + if (rpath == NULL) { + reply_with_perror (&q...

The first patch preserves file mode, UID, GID and SELinux context across edited files. The second patch adds a useful new command in guestfish ('llz') which shows SELinux context (like 'ls -laZ') that was useful when debugging this. Rich.

...git a/daemon/ls.c b/daemon/ls.c index 5adf5ef..b2de9e5 100644 --- a/daemon/ls.c +++ b/daemon/ls.c @@ -30,6 +30,8 @@ #include "daemon.h" #include "actions.h" +GUESTFSD_EXT_CMD(str_ls, ls); + /* Has one FileOut parameter. */ int do_ls0 (const char *path) @@ -112,7 +114,7 @@ do_ll (const char *path) return NULL; } - r = command (&out, &err, "ls", "-la", spath, NULL); + r = command (&out, &err, str_ls, "-la", spath, NULL); free (spath); if (r == -1) { reply_with_error ("%s", err); @@ -138,7 +140,7...

...-git a/daemon/ls.c b/daemon/ls.c index 5adf5ef..0a748f7 100644 --- a/daemon/ls.c +++ b/daemon/ls.c @@ -30,6 +30,8 @@ #include "daemon.h" #include "actions.h" +GUESTFS_EXT_CMD(str_ls, ls); + /* Has one FileOut parameter. */ int do_ls0 (const char *path) @@ -112,7 +114,7 @@ do_ll (const char *path) return NULL; } - r = command (&out, &err, "ls", "-la", spath, NULL); + r = command (&out, &err, str_ls, "-la", spath, NULL); free (spath); if (r == -1) { reply_with_error ("%s", err); @@ -138,7 +140,7...

...a/daemon/ls.c b/daemon/ls.c index 0e2f110f5..23bba5041 100644 --- a/daemon/ls.c +++ b/daemon/ls.c @@ -30,8 +30,6 @@ #include "daemon.h" #include "actions.h" -GUESTFSD_EXT_CMD(str_ls, ls); - /* Has one FileOut parameter. */ int do_ls0 (const char *path) @@ -118,7 +116,7 @@ do_ll (const char *path) return NULL; } - r = command (&out, &err, str_ls, "-la", spath, NULL); + r = command (&out, &err, "ls", "-la", spath, NULL); if (r == -1) { reply_with_error ("%s", err); free (out); @@ -151,7 +149,7...

...aemon/ls.c index 0e2f110f5..9c97cf51f 100644 --- a/daemon/ls.c +++ b/daemon/ls.c @@ -30,7 +30,7 @@ #include "daemon.h" #include "actions.h" -GUESTFSD_EXT_CMD(str_ls, ls); +DECLARE_EXTERNAL_COMMANDS ("ls") /* Has one FileOut parameter. */ int @@ -118,7 +118,7 @@ do_ll (const char *path) return NULL; } - r = command (&out, &err, str_ls, "-la", spath, NULL); + r = command (&out, &err, "ls", "-la", spath, NULL); if (r == -1) { reply_with_error ("%s", err); free (out); @@ -151,7 +151,7...

This started as a simple warning-elimination change. I'll get back to that series shortly ;-) It turned into a factorization and constification exercise during which I got a taste of ocaml. Thanks to Rich Jones for help with a few snippets in generator.ml. The overall result is that many previously-manually-maintained bits from daemon/*.c functions are now hoisted into the automatically-

This is a simpler patch that removes GUESTFSD_EXT_CMD completely.

Replace GUESTFSD_EXT_CMD with a command line option ‘./guestfsd --print-external-commands’