X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Ffile.c;h=98c356dff7dd9a135bd6e6a8488b5f44c2928a4a;hp=8847d2622aedb090ba0c09636dab71dfa556bd33;hb=4c54721ad46b77c52eb6bb7e3ffe74325ac52797;hpb=bb98bbb91c74cca47b5e1f79fd54f4024572fd22

diff --git a/daemon/file.c b/daemon/file.c
index 8847d26..98c356d 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
@@ -30,7 +30,7 @@
 #include "actions.h"
 
 int
-do_touch (const char *path)
+do_touch (char *path)
 {
   int fd;
   int r;
@@ -58,12 +58,16 @@ do_touch (const char *path)
     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;
@@ -134,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;
@@ -186,7 +190,7 @@ do_read_lines (const char *path)
 }
 
 int
-do_rm (const char *path)
+do_rm (char *path)
 {
   int r;
 
@@ -206,7 +210,7 @@ do_rm (const char *path)
 }
 
 int
-do_chmod (int mode, const char *path)
+do_chmod (int mode, char *path)
 {
   int r;
 
@@ -226,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;
 
@@ -246,7 +250,7 @@ do_chown (int owner, int group, const char *path)
 }
 
 int
-do_exists (const char *path)
+do_exists (char *path)
 {
   int r;
 
@@ -261,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;
@@ -286,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;
 
@@ -321,7 +325,7 @@ do_write_file (const char *path, const char *content, int size)
 
 /* This runs the 'file' command. */
 char *
-do_file (const char *path)
+do_file (char *path)
 {
   char *out, *err;
   int r, len, freeit = 0;
@@ -372,3 +376,63 @@ 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) + 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, " /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);
+}