X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Ffile.c;h=212aff28e9b6cfdc03f487b16fab1af8695f13c8;hp=d8759f0d70757b6dbd6e699e96aab24dedd58a5b;hb=9dd53bcb10283295d7fb5f0a3469be2984d99926;hpb=42283403886da648bb239177369aa65c0a659255 diff --git a/daemon/file.c b/daemon/file.c index d8759f0..212aff2 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 @@ -35,12 +33,10 @@ int do_touch (const char *path) { int fd; - - NEED_ROOT (-1); - ABS_PATH (path, -1); + int r; 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,13 +44,22 @@ 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; } @@ -65,9 +70,6 @@ do_cat (const char *path) int alloc, size, r, max; char *buf, *buf2; - NEED_ROOT (NULL); - ABS_PATH (path,NULL); - CHROOT_IN; fd = open (path, O_RDONLY); CHROOT_OUT; @@ -89,18 +91,18 @@ do_cat (const char *path) if (size >= alloc) { alloc += 8192; if (alloc > max) { - reply_with_error ("cat: %s: file is too large for message buffer", - path); - free (buf); - close (fd); - return NULL; + reply_with_error ("cat: %s: file is too large for message buffer", + path); + free (buf); + close (fd); + return NULL; } buf2 = realloc (buf, alloc); if (buf2 == NULL) { - reply_with_perror ("realloc"); - free (buf); - close (fd); - return NULL; + reply_with_perror ("realloc"); + free (buf); + close (fd); + return NULL; } buf = buf2; } @@ -139,9 +141,6 @@ do_read_lines (const char *path) size_t len = 0; ssize_t n; - NEED_ROOT (NULL); - ABS_PATH (path, NULL); - CHROOT_IN; fp = fopen (path, "r"); CHROOT_OUT; @@ -186,9 +185,6 @@ do_rm (const char *path) { int r; - NEED_ROOT (-1); - ABS_PATH (path, -1); - CHROOT_IN; r = unlink (path); CHROOT_OUT; @@ -206,9 +202,6 @@ do_chmod (int mode, const char *path) { int r; - NEED_ROOT (-1); - ABS_PATH (path, -1); - CHROOT_IN; r = chmod (path, mode); CHROOT_OUT; @@ -226,9 +219,6 @@ do_chown (int owner, int group, const char *path) { int r; - NEED_ROOT (-1); - ABS_PATH (path, -1); - CHROOT_IN; r = chown (path, owner, group); CHROOT_OUT; @@ -246,9 +236,6 @@ do_exists (const char *path) { int r; - NEED_ROOT (-1); - ABS_PATH (path, -1); - CHROOT_IN; r = access (path, F_OK); CHROOT_OUT; @@ -262,9 +249,6 @@ do_is_file (const char *path) int r; struct stat buf; - NEED_ROOT (-1); - ABS_PATH (path, -1); - CHROOT_IN; r = lstat (path, &buf); CHROOT_OUT; @@ -286,14 +270,11 @@ do_write_file (const char *path, const char *content, int size) { int fd; - NEED_ROOT (-1); - ABS_PATH (path, -1); - if (size == 0) 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 +296,81 @@ 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 (const 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); + CHROOT_IN; + fd = open (path, O_RDONLY); + CHROOT_OUT; - len = strlen (path) + 9; - buf = malloc (len); - if (!buf) { + 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; + } + + if (xread (fd, r, *size_r) == -1) { + reply_with_perror ("read: %s", path); + close (fd); + free (r); return NULL; } - snprintf (buf, len, "/sysroot%s", path); + + if (close (fd) == -1) { + reply_with_perror ("close: %s", path); + free (r); + return NULL; + } + + return r; +} + +/* This runs the 'file' command. */ +char * +do_file (const char *path) +{ + char *out, *err; + int r, freeit = 0; + char *buf; + int len; + + 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 +378,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); + r = command (&out, &err, "file", "-zbsL", buf, NULL); + if (freeit) free (buf); if (r == -1) { free (out); @@ -363,3 +401,57 @@ do_file (const char *path) return out; /* caller frees */ } + +/* zcat | file */ +char * +do_zfile (const char *method, const char *path) +{ + int len; + const char *zcat; + char *cmd; + FILE *fp; + char line[256]; + + if (strcmp (method, "gzip") == 0 || strcmp (method, "compress") == 0) + zcat = "zcat"; + else if (strcmp (method, "bzip2") == 0) + zcat = "bzcat"; + else { + reply_with_error ("zfile: unknown method"); + return NULL; + } + + if (asprintf_nowarn (&cmd, "%s %R | file -bsL -", zcat, path) == -1) { + reply_with_perror ("asprintf"); + return NULL; + } + + if (verbose) + fprintf (stderr, "%s\n", cmd); + + 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); +}