X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=fuse%2Fguestmount.c;h=c935493b565e7a6b4fbe2773e3ded4f80aa7ea33;hb=db8a46aa1165479ddf2b551e81a7e96bb06fc942;hp=d45c18bd90e81ee01d1727258079ce46ff7c14b0;hpb=b9de2dc61162bf7cb89560319aab5e96b920e8e0;p=libguestfs.git

diff --git a/fuse/guestmount.c b/fuse/guestmount.c
index d45c18b..c935493 100644
--- a/fuse/guestmount.c
+++ b/fuse/guestmount.c
@@ -46,6 +46,7 @@
 
 #include "progname.h"
 
+#include "guestmount.h"
 #include "dircache.h"
 
 /* See <attr/xattr.h> */
@@ -53,21 +54,6 @@
 #define ENOATTR ENODATA
 #endif
 
-#ifdef HAVE_GETTEXT
-#include "gettext.h"
-#define _(str) dgettext(PACKAGE, (str))
-//#define N_(str) dgettext(PACKAGE, (str))
-#else
-#define _(str) str
-//#define N_(str) str
-#endif
-
-static inline char *
-bad_cast (char const *s)
-{
-  return (char *) s;
-}
-
 static guestfs_h *g = NULL;
 static int read_only = 0;
 int verbose = 0;
@@ -441,7 +427,7 @@ fg_symlink (const char *from, const char *to)
 
   dir_cache_invalidate (to);
 
-  r = guestfs_ln_s (g, to, from);
+  r = guestfs_ln_s (g, from, to);
   if (r == -1)
     return error ();
 
@@ -455,6 +441,7 @@ fg_rename (const char *from, const char *to)
 
   if (read_only) return -EROFS;
 
+  dir_cache_invalidate (from);
   dir_cache_invalidate (to);
 
   /* XXX It's not clear how close the 'mv' command is to the
@@ -475,9 +462,10 @@ fg_link (const char *from, const char *to)
 
   if (read_only) return -EROFS;
 
+  dir_cache_invalidate (from);
   dir_cache_invalidate (to);
 
-  r = guestfs_ln (g, to, from);
+  r = guestfs_ln (g, from, to);
   if (r == -1)
     return error ();
 
@@ -546,14 +534,22 @@ fg_utimens (const char *path, const struct timespec ts[2])
   time_t mtsecs = ts[1].tv_sec;
   long mtnsecs = ts[1].tv_nsec;
 
+#ifdef UTIME_NOW
   if (atnsecs == UTIME_NOW)
     atnsecs = -1;
+#endif
+#ifdef UTIME_OMIT
   if (atnsecs == UTIME_OMIT)
     atnsecs = -2;
+#endif
+#ifdef UTIME_NOW
   if (mtnsecs == UTIME_NOW)
     mtnsecs = -1;
+#endif
+#ifdef UTIME_OMIT
   if (mtnsecs == UTIME_OMIT)
     mtnsecs = -2;
+#endif
 
   r = guestfs_utimens (g, path, atsecs, atnsecs, mtsecs, mtnsecs);
   if (r == -1)
@@ -862,7 +858,7 @@ fuse_help (void)
 {
   const char *tmp_argv[] = { program_name, "--help", NULL };
   fuse_main (2, (char **) tmp_argv, &fg_operations, NULL);
-  exit (0);
+  exit (EXIT_SUCCESS);
 }
 
 static void __attribute__((noreturn))
@@ -900,6 +896,10 @@ usage (int status)
 int
 main (int argc, char *argv[])
 {
+  setlocale (LC_ALL, "");
+  bindtextdomain (PACKAGE, LOCALEBASEDIR);
+  textdomain (PACKAGE);
+
   enum { HELP_OPTION = CHAR_MAX + 1 };
 
   /* The command line arguments are broadly compatible with (a subset
@@ -940,7 +940,7 @@ main (int argc, char *argv[])
     fuse_argv = realloc (fuse_argv, (1+fuse_argc) * sizeof (char *));   \
     if (!fuse_argv) {                                                   \
       perror ("realloc");                                               \
-      exit (1);                                                         \
+      exit (EXIT_FAILURE);                                                         \
     }                                                                   \
     fuse_argv[fuse_argc-1] = (str);                                     \
     fuse_argv[fuse_argc] = NULL;                                        \
@@ -963,7 +963,7 @@ main (int argc, char *argv[])
   g = guestfs_create ();
   if (g == NULL) {
     fprintf (stderr, _("guestfs_create: failed to create handle\n"));
-    exit (1);
+    exit (EXIT_FAILURE);
   }
 
   guestfs_set_autosync (g, 1);
@@ -1009,19 +1009,19 @@ main (int argc, char *argv[])
       else {
         fprintf (stderr, _("%s: unknown long option: %s (%d)\n"),
                  program_name, long_options[option_index].name, option_index);
-        exit (1);
+        exit (EXIT_FAILURE);
       }
       break;
 
     case 'a':
       if (access (optarg, R_OK) != 0) {
         perror (optarg);
-        exit (1);
+        exit (EXIT_FAILURE);
       }
       drv = malloc (sizeof (struct drv));
       if (!drv) {
         perror ("malloc");
-        exit (1);
+        exit (EXIT_FAILURE);
       }
       drv->filename = optarg;
       drv->next = drvs;
@@ -1032,7 +1032,7 @@ main (int argc, char *argv[])
       mp = malloc (sizeof (struct mp));
       if (!mp) {
         perror ("malloc");
-        exit (1);
+        exit (EXIT_FAILURE);
       }
       p = strchr (optarg, ':');
       if (p) {
@@ -1065,13 +1065,13 @@ main (int argc, char *argv[])
 
     case 'V':
       printf ("%s %s\n", program_name, PACKAGE_VERSION);
-      exit (0);
+      exit (EXIT_SUCCESS);
 
     case HELP_OPTION:
-      usage (0);
+      usage (EXIT_SUCCESS);
 
     default:
-      usage (1);
+      usage (EXIT_FAILURE);
     }
   }
 
@@ -1080,7 +1080,7 @@ main (int argc, char *argv[])
     fprintf (stderr,
              _("%s: must have at least one -a and at least one -m option\n"),
              program_name);
-    exit (1);
+    exit (EXIT_FAILURE);
   }
 
   /* We'd better have a mountpoint. */
@@ -1088,18 +1088,18 @@ main (int argc, char *argv[])
     fprintf (stderr,
              _("%s: you must specify a mountpoint in the host filesystem\n"),
              program_name);
-    exit (1);
+    exit (EXIT_FAILURE);
   }
 
   /* Do the guest drives and mountpoints. */
   add_drives (drvs);
   if (guestfs_launch (g) == -1)
-    exit (1);
+    exit (EXIT_FAILURE);
   mount_mps (mps);
 
   /* FUSE example does this, not clear if it's necessary, but ... */
   if (guestfs_umask (g, 0) == -1)
-    exit (1);
+    exit (EXIT_FAILURE);
 
   /* At the last minute, remove the libguestfs error handler.  In code
    * above this point, the default error handler has been used which
@@ -1148,7 +1148,7 @@ add_drives (struct drv *drv)
     else
       r = guestfs_add_drive_ro (g, drv->filename);
     if (r == -1)
-      exit (1);
+      exit (EXIT_FAILURE);
   }
 }
 
@@ -1165,6 +1165,6 @@ mount_mps (struct mp *mp)
     else
       r = guestfs_mount_ro (g, mp->device, mp->mountpoint);
     if (r == -1)
-      exit (1);
+      exit (EXIT_FAILURE);
   }
 }