X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fguestfsd.c;h=c701f194a558546defa2d4cafc67c6cfb010ab25;hb=92804dec7c4982d2039f81586bc4a5cacb46217b;hp=6fc8b19fbd25f629063e9fc89dc44a4a5ac9dc27;hpb=d134143b55ecb5f7e6f74318acbf04f9e1370af6;p=libguestfs.git diff --git a/daemon/guestfsd.c b/daemon/guestfsd.c index 6fc8b19..c701f19 100644 --- a/daemon/guestfsd.c +++ b/daemon/guestfsd.c @@ -18,6 +18,8 @@ #include +#define _BSD_SOURCE /* for daemon(3) */ + #include #include #include @@ -26,11 +28,13 @@ #include #include #include +#include +#include +#include +#include #include "daemon.h" -void xwrite (int sock, const void *buf, size_t len); - static void usage (void); /* Also in guestfs.c */ @@ -166,29 +170,25 @@ main (int argc, char *argv[]) exit (1); } - xwrite (sock, buf, xdr_getpos (&xdr)); + (void) xwrite (sock, buf, xdr_getpos (&xdr)); xdr_destroy (&xdr); - /* XXX Fork into the background. */ - - - - - - - - - - - + /* Fork into the background. */ + if (!dont_fork) { + if (daemon (0, 1) == -1) { + perror ("daemon"); + exit (1); + } + } + /* Enter the main loop, reading and performing actions. */ main_loop (sock); exit (0); } -void +int xwrite (int sock, const void *buf, size_t len) { int r; @@ -197,14 +197,16 @@ xwrite (int sock, const void *buf, size_t len) r = write (sock, buf, len); if (r == -1) { perror ("write"); - exit (1); + return -1; } buf += r; len -= r; } + + return 0; } -void +int xread (int sock, void *buf, size_t len) { int r; @@ -213,15 +215,17 @@ xread (int sock, void *buf, size_t len) r = read (sock, buf, len); if (r == -1) { perror ("read"); - exit (1); + return -1; } if (r == 0) { - fprintf (stderr, "read: unexpected end of file on comms socket\n"); - exit (1); + fprintf (stderr, "read: unexpected end of file on fd %d\n", sock); + return -1; } buf += r; len -= r; } + + return 0; } static void @@ -230,17 +234,254 @@ usage (void) fprintf (stderr, "guestfsd [-f] [-h host -p port]\n"); } -/* Some unimplemented actions. */ int -do_mount (const char *device, const char *mountpoint) +add_string (char ***argv, int *size, int *alloc, const char *str) { - reply_with_error ("mount not implemented"); - return -1; + char **new_argv; + char *new_str; + + if (*size >= *alloc) { + *alloc += 64; + new_argv = realloc (*argv, *alloc * sizeof (char *)); + if (new_argv == NULL) { + reply_with_perror ("realloc"); + free_strings (*argv); + return -1; + } + *argv = new_argv; + } + + if (str) { + new_str = strdup (str); + if (new_str == NULL) { + reply_with_perror ("strdup"); + free_strings (*argv); + } + } else + new_str = NULL; + + (*argv)[*size] = new_str; + + (*size)++; + return 0; } int -do_touch (const char *path) +count_strings (char * const* const argv) +{ + int argc; + + for (argc = 0; argv[argc] != NULL; ++argc) + ; + return argc; +} + +static int +compare (const void *vp1, const void *vp2) +{ + char * const *p1 = (char * const *) vp1; + char * const *p2 = (char * const *) vp2; + return strcmp (*p1, *p2); +} + +void +sort_strings (char **argv, int len) { - reply_with_error ("touch not implemented"); - return -1; + qsort (argv, len, sizeof (char *), compare); +} + +void +free_strings (char **argv) +{ + int argc; + + for (argc = 0; argv[argc] != NULL; ++argc) + free (argv[argc]); + free (argv); +} + +void +free_stringslen (char **argv, int len) +{ + int i; + + for (i = 0; i < len; ++i) + free (argv[i]); + free (argv); +} + +/* This is a more sane version of 'system(3)' for running external + * commands. It uses fork/execvp, so we don't need to worry about + * quoting of parameters, and it allows us to capture any error + * messages in a buffer. + */ +int +command (char **stdoutput, char **stderror, const char *name, ...) +{ + va_list args; + char **argv; + char *s; + int i, r; + + /* Collect the command line arguments into an array. */ + va_start (args, name); + + i = 2; + argv = malloc (sizeof (char *) * i); + argv[0] = (char *) name; + argv[1] = NULL; + + while ((s = va_arg (args, char *)) != NULL) { + argv = realloc (argv, sizeof (char *) * (++i)); + argv[i-2] = s; + argv[i-1] = NULL; + } + + va_end (args); + + r = commandv (stdoutput, stderror, argv); + + /* NB: Mustn't free the strings which are on the stack. */ + free (argv); + + return r; +} + +int +commandv (char **stdoutput, char **stderror, char * const* const argv) +{ + int so_size = 0, se_size = 0; + int so_fd[2], se_fd[2]; + int pid, r, quit, i; + fd_set rset, rset2; + char buf[256]; + + if (stdoutput) *stdoutput = NULL; + if (stderror) *stderror = NULL; + + printf ("%s", argv[0]); + for (i = 1; argv[i] != NULL; ++i) + printf (" %s", argv[i]); + printf ("\n"); + + if (pipe (so_fd) == -1 || pipe (se_fd) == -1) { + perror ("pipe"); + return -1; + } + + pid = fork (); + if (pid == -1) { + perror ("fork"); + return -1; + } + + if (pid == 0) { /* Child process. */ + close (0); + close (so_fd[0]); + close (se_fd[0]); + dup2 (so_fd[1], 1); + dup2 (se_fd[1], 2); + close (so_fd[1]); + close (se_fd[1]); + + execvp (argv[0], argv); + perror (argv[0]); + _exit (1); + } + + /* Parent process. */ + close (so_fd[1]); + close (se_fd[1]); + + FD_ZERO (&rset); + FD_SET (so_fd[0], &rset); + FD_SET (se_fd[0], &rset); + + quit = 0; + while (quit < 2) { + rset2 = rset; + r = select (MAX (so_fd[0], se_fd[0]) + 1, &rset2, NULL, NULL, NULL); + if (r == -1) { + perror ("select"); + waitpid (pid, NULL, 0); + return -1; + } + + if (FD_ISSET (so_fd[0], &rset2)) { /* something on stdout */ + r = read (so_fd[0], buf, sizeof buf); + if (r == -1) { + perror ("read"); + waitpid (pid, NULL, 0); + return -1; + } + if (r == 0) { FD_CLR (so_fd[0], &rset); quit++; } + + if (r > 0 && stdoutput) { + so_size += r; + *stdoutput = realloc (*stdoutput, so_size); + if (*stdoutput == NULL) { + perror ("realloc"); + *stdoutput = NULL; + continue; + } + memcpy (*stdoutput + so_size - r, buf, r); + } + } + + if (FD_ISSET (se_fd[0], &rset2)) { /* something on stderr */ + r = read (se_fd[0], buf, sizeof buf); + if (r == -1) { + perror ("read"); + waitpid (pid, NULL, 0); + return -1; + } + if (r == 0) { FD_CLR (se_fd[0], &rset); quit++; } + + if (r > 0 && stderror) { + se_size += r; + *stderror = realloc (*stderror, se_size); + if (*stderror == NULL) { + perror ("realloc"); + *stderror = NULL; + continue; + } + memcpy (*stderror + se_size - r, buf, r); + } + } + } + + /* Make sure the output buffers are \0-terminated. Also remove any + * trailing \n characters from the error buffer (not from stdout). + */ + if (stdoutput) { + *stdoutput = realloc (*stdoutput, so_size+1); + if (*stdoutput == NULL) { + perror ("realloc"); + *stdoutput = NULL; + } else + (*stdoutput)[so_size] = '\0'; + } + if (stderror) { + *stderror = realloc (*stderror, se_size+1); + if (*stderror == NULL) { + perror ("realloc"); + *stderror = NULL; + } else { + (*stderror)[se_size] = '\0'; + se_size--; + while (se_size >= 0 && (*stderror)[se_size] == '\n') + (*stderror)[se_size--] = '\0'; + } + } + + /* Get the exit status of the command. */ + waitpid (pid, &r, 0); + + if (WIFEXITED (r)) { + if (WEXITSTATUS (r) == 0) + return 0; + else + return -1; + } else + return -1; }