X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=fish%2Fedit.c;h=1b6ce23cac165acf49e25f9c7e58c9d9da6c5d61;hp=c27f1009949a7f071bd1b9f71d0f3fe3c47821a5;hb=c17ff8145718ed86419a7f6c5000b73dd54e324a;hpb=05712b2457a44ee0f0020eced77db03c2aa419a1;ds=sidebyside

diff --git a/fish/edit.c b/fish/edit.c
index c27f100..1b6ce23 100644
--- a/fish/edit.c
+++ b/fish/edit.c
@@ -1,5 +1,5 @@
 /* guestfish - the filesystem interactive shell
- * 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
@@ -29,26 +29,8 @@
 
 /* guestfish edit command, suggested by Ján Ondrej, implemented by RWMJ */
 
-static int
-xwrite (int fd, const void *buf, size_t len)
-{
-  int r;
-
-  while (len > 0) {
-    r = write (fd, buf, len);
-    if (r == -1) {
-      perror ("write");
-      return -1;
-    }
-    buf += r;
-    len -= r;
-  }
-
-  return 0;
-}
-
 static char *
-load_file (const char *filename, int *len_r)
+load_file (const char *filename, size_t *len_r)
 {
   int fd, r, start;
   char *content = NULL, *p;
@@ -98,10 +80,10 @@ do_edit (const char *cmd, int argc, char *argv[])
   char buf[256];
   const char *editor;
   char *content, *content_new;
-  int r, fd, size;
+  int r, fd;
 
   if (argc != 1) {
-    fprintf (stderr, "use '%s filename' to edit a file\n", cmd);
+    fprintf (stderr, _("use '%s filename' to edit a file\n"), cmd);
     return -1;
   }
 
@@ -156,6 +138,7 @@ do_edit (const char *cmd, int argc, char *argv[])
   }
 
   /* Reload it. */
+  size_t size;
   content_new = load_file (filename, &size);
   if (content_new == NULL) {
     unlink (filename);