fuse/RHEL: Don't require UTIME_{NOW,OMIT} to be defined.

[libguestfs.git] / fuse / guestmount.c

diff --git a/fuse/guestmount.c b/fuse/guestmount.c
index d45c18b..05cacef 100644 (file)
--- 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)