X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=daemon%2Ffile.c;h=ce4496723515d3419f8e5e77dbe3819e8a21b150;hb=dd0432e2efc2e22ddbc9fb0a2746ee1c6a9c582f;hp=1e633d852391448b9a6c659042f80e4968f87db0;hpb=99bd425a0a8fb02c27e0c22b32dafa804773a7b1;p=libguestfs.git

diff --git a/daemon/file.c b/daemon/file.c
index 1e633d8..ce44967 100644
--- a/daemon/file.c
+++ b/daemon/file.c
@@ -18,7 +18,7 @@
 
 #include <config.h>
 
-#define _GNU_SOURCE		/* for futimens(2) */
+#define _GNU_SOURCE		/* for futimens(2) and getline(3) */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -27,6 +27,7 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 
+#include "../src/guestfs_protocol.h"
 #include "daemon.h"
 #include "actions.h"
 
@@ -35,12 +36,8 @@ do_touch (const char *path)
 {
   int fd;
 
-  NEED_ROOT;
-
-  if (path[0] != '/') {
-    reply_with_error ("touch: path must start with a / character");
-    return -1;
-  }
+  NEED_ROOT (-1);
+  ABS_PATH (path, -1);
 
   CHROOT_IN;
   fd = open (path, O_WRONLY | O_CREAT | O_NOCTTY | O_NONBLOCK, 0666);
@@ -48,7 +45,6 @@ do_touch (const char *path)
 
   if (fd == -1) {
     reply_with_perror ("open: %s", path);
-    close (fd);
     return -1;
   }
 
@@ -61,3 +57,126 @@ do_touch (const char *path)
   close (fd);
   return 0;
 }
+
+char *
+do_cat (const char *path)
+{
+  int fd;
+  int alloc, size, r, max;
+  char *buf, *buf2;
+
+  NEED_ROOT (NULL);
+  ABS_PATH (path,NULL);
+
+  CHROOT_IN;
+  fd = open (path, O_RDONLY);
+  CHROOT_OUT;
+
+  if (fd == -1) {
+    reply_with_perror ("open: %s", path);
+    return NULL;
+  }
+
+  /* Read up to GUESTFS_MESSAGE_MAX - <overhead> bytes.  If it's
+   * larger than that, we need to return an error instead (for
+   * correctness).
+   */
+  max = GUESTFS_MESSAGE_MAX - 1000;
+  buf = NULL;
+  size = alloc = 0;
+
+  for (;;) {
+    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;
+      }
+      buf2 = realloc (buf, alloc);
+      if (buf2 == NULL) {
+	reply_with_perror ("realloc");
+	free (buf);
+	close (fd);
+	return NULL;
+      }
+      buf = buf2;
+    }
+
+    r = read (fd, buf + size, alloc - size);
+    if (r == -1) {
+      reply_with_perror ("read: %s", path);
+      free (buf);
+      close (fd);
+      return NULL;
+    }
+    if (r == 0) {
+      buf[size] = '\0';
+      break;
+    }
+    if (r > 0)
+      size += r;
+  }
+
+  if (close (fd) == -1) {
+    reply_with_perror ("close: %s", path);
+    free (buf);
+    return NULL;
+  }
+
+  return buf;			/* caller will free */
+}
+
+char **
+do_read_lines (const char *path)
+{
+  char **r = NULL;
+  int size = 0, alloc = 0;
+  FILE *fp;
+  char *line = NULL;
+  size_t len = 0;
+  ssize_t n;
+
+  NEED_ROOT (NULL);
+  ABS_PATH (path, NULL);
+
+  CHROOT_IN;
+  fp = fopen (path, "r");
+  CHROOT_OUT;
+
+  if (!fp) {
+    reply_with_perror ("fopen: %s", path);
+    return NULL;
+  }
+
+  while ((n = getline (&line, &len, fp)) != -1) {
+    /* Remove either LF or CRLF. */
+    if (n >= 2 && line[n-2] == '\r' && line[n-1] == '\n')
+      line[n-2] = '\0';
+    else if (n >= 1 && line[n-1] == '\n')
+      line[n-1] = '\0';
+
+    if (add_string (&r, &size, &alloc, line) == -1) {
+      free (line);
+      fclose (fp);
+      return NULL;
+    }
+  }
+
+  free (line);
+
+  if (add_string (&r, &size, &alloc, NULL) == -1) {
+    fclose (fp);
+    return NULL;
+  }
+
+  if (fclose (fp) == EOF) {
+    reply_with_perror ("fclose: %s", path);
+    free_strings (r);
+    return NULL;
+  }
+
+  return r;
+}