X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Ffile.c;h=7c46722c991d5d3558cfe7b0d61e94f99a939a5c;hp=d8759f0d70757b6dbd6e699e96aab24dedd58a5b;hb=26f69f706e8c661c6ae7946da1b9a4b7bf9150b9;hpb=42283403886da648bb239177369aa65c0a659255 diff --git a/daemon/file.c b/daemon/file.c index d8759f0..7c46722 100644 --- a/daemon/file.c +++ b/daemon/file.c @@ -1,5 +1,5 @@ /* libguestfs - the guestfsd daemon - * Copyright (C) 2009 Red Hat Inc. + * Copyright (C) 2009 Red Hat Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,8 +18,6 @@ #include -#define _GNU_SOURCE /* for futimens(2) and getline(3) */ - #include #include #include @@ -32,15 +30,16 @@ #include "actions.h" int -do_touch (const char *path) +do_touch (char *path) { int fd; + int r; NEED_ROOT (-1); ABS_PATH (path, -1); CHROOT_IN; - fd = open (path, O_WRONLY | O_CREAT | O_NOCTTY | O_NONBLOCK, 0666); + fd = open (path, O_WRONLY | O_CREAT | O_NOCTTY, 0666); CHROOT_OUT; if (fd == -1) { @@ -48,18 +47,27 @@ do_touch (const char *path) return -1; } - if (futimens (fd, NULL) == -1) { +#ifdef HAVE_FUTIMENS + r = futimens (fd, NULL); +#else + r = futimes (fd, NULL); +#endif + if (r == -1) { reply_with_perror ("futimens: %s", path); close (fd); return -1; } - close (fd); + if (close (fd) == -1) { + reply_with_perror ("close: %s", path); + return -1; + } + return 0; } char * -do_cat (const char *path) +do_cat (char *path) { int fd; int alloc, size, r, max; @@ -130,7 +138,7 @@ do_cat (const char *path) } char ** -do_read_lines (const char *path) +do_read_lines (char *path) { char **r = NULL; int size = 0, alloc = 0; @@ -182,7 +190,7 @@ do_read_lines (const char *path) } int -do_rm (const char *path) +do_rm (char *path) { int r; @@ -202,7 +210,7 @@ do_rm (const char *path) } int -do_chmod (int mode, const char *path) +do_chmod (int mode, char *path) { int r; @@ -222,7 +230,7 @@ do_chmod (int mode, const char *path) } int -do_chown (int owner, int group, const char *path) +do_chown (int owner, int group, char *path) { int r; @@ -242,7 +250,7 @@ do_chown (int owner, int group, const char *path) } int -do_exists (const char *path) +do_exists (char *path) { int r; @@ -257,7 +265,7 @@ do_exists (const char *path) } int -do_is_file (const char *path) +do_is_file (char *path) { int r; struct stat buf; @@ -282,7 +290,7 @@ do_is_file (const char *path) } int -do_write_file (const char *path, const char *content, int size) +do_write_file (char *path, char *content, int size) { int fd; @@ -293,7 +301,7 @@ do_write_file (const char *path, const char *content, int size) size = strlen (content); CHROOT_IN; - fd = open (path, O_WRONLY | O_CREAT | O_NOCTTY | O_NONBLOCK, 0666); + fd = open (path, O_WRONLY | O_TRUNC | O_CREAT | O_NOCTTY, 0666); CHROOT_OUT; if (fd == -1) { @@ -315,24 +323,87 @@ do_write_file (const char *path, const char *content, int size) return 0; } -/* This runs the 'file' command. */ char * -do_file (const char *path) +do_read_file (char *path, size_t *size_r) { - char *out, *err; - int r, len; - char *buf; + int fd; + struct stat statbuf; + char *r; NEED_ROOT (NULL); ABS_PATH (path, NULL); - len = strlen (path) + 9; - buf = malloc (len); - if (!buf) { + CHROOT_IN; + fd = open (path, O_RDONLY); + CHROOT_OUT; + + if (fd == -1) { + reply_with_perror ("open: %s", path); + return NULL; + } + + if (fstat (fd, &statbuf) == -1) { + reply_with_perror ("fstat: %s", path); + close (fd); + return NULL; + } + + *size_r = statbuf.st_size; + /* The actual limit on messages is smaller than this. This + * check just limits the amount of memory we'll try and allocate + * here. If the message is larger than the real limit, that will + * be caught later when we try to serialize the message. + */ + if (*size_r >= GUESTFS_MESSAGE_MAX) { + reply_with_error ("read_file: %s: file is too large for the protocol, use guestfs_download instead", path); + close (fd); + return NULL; + } + r = malloc (*size_r); + if (r == NULL) { reply_with_perror ("malloc"); + close (fd); return NULL; } - snprintf (buf, len, "/sysroot%s", path); + + if (xread (fd, r, *size_r) == -1) { + reply_with_perror ("read: %s", path); + close (fd); + free (r); + return NULL; + } + + if (close (fd) == -1) { + reply_with_perror ("close: %s", path); + free (r); + return NULL; + } + + return r; +} + +/* This runs the 'file' command. */ +char * +do_file (char *path) +{ + char *out, *err; + int r, freeit = 0; + char *buf; + int len; + + NEED_ROOT_OR_IS_DEVICE (path, NULL); + ABS_PATH (path, NULL); + + if (strncmp (path, "/dev/", 5) == 0) + buf = (char *) path; + else { + buf = sysroot_path (path); + if (!buf) { + reply_with_perror ("malloc"); + return NULL; + } + freeit = 1; + } /* file(1) manpage claims "file returns 0 on success, and non-zero on * error", but this is evidently not true. It always returns 0, in @@ -340,13 +411,13 @@ do_file (const char *path) * first. */ if (access (buf, R_OK) == -1) { - free (buf); + if (freeit) free (buf); reply_with_perror ("access: %s", path); return NULL; } r = command (&out, &err, "file", "-bsL", buf, NULL); - free (buf); + if (freeit) free (buf); if (r == -1) { free (out); @@ -363,3 +434,64 @@ do_file (const char *path) return out; /* caller frees */ } + +/* zcat | file */ +char * +do_zfile (char *method, char *path) +{ + int len; + char *cmd; + FILE *fp; + char line[256]; + + NEED_ROOT (NULL); + ABS_PATH (path, NULL); + + len = 2 * strlen (path) + sysroot_len + 64; + cmd = malloc (len); + if (!cmd) { + reply_with_perror ("malloc"); + return NULL; + } + + if (strcmp (method, "gzip") == 0 || strcmp (method, "compress") == 0) + strcpy (cmd, "zcat"); + else if (strcmp (method, "bzip2") == 0) + strcpy (cmd, "bzcat"); + else { + free (cmd); + reply_with_error ("zfile: unknown method"); + return NULL; + } + + strcat (cmd, " "); + strcat (cmd, sysroot); + shell_quote (cmd + strlen (cmd), len - strlen (cmd), path); + strcat (cmd, " | file -bsL -"); + + fp = popen (cmd, "r"); + if (fp == NULL) { + reply_with_perror ("%s", cmd); + free (cmd); + return NULL; + } + + free (cmd); + + if (fgets (line, sizeof line, fp) == NULL) { + reply_with_perror ("zfile: fgets"); + fclose (fp); + return NULL; + } + + if (fclose (fp) == -1) { + reply_with_perror ("zfile: fclose"); + return NULL; + } + + len = strlen (line); + if (len > 0 && line[len-1] == '\n') + line[len-1] = '\0'; + + return strdup (line); +}