#include "progname.h"
+#include "guestmount.h"
#include "dircache.h"
/* See <attr/xattr.h> */
#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;
memcpy (buf, r, len);
buf[len] = '\0';
- if (free_it)
- free ((char *) r);
+ if (free_it) {
+ char *tmp = (char *) r;
+ free (tmp);
+ }
return 0;
}
dir_cache_invalidate (to);
- r = guestfs_ln_s (g, to, from);
+ r = guestfs_ln_s (g, from, to);
if (r == -1)
return error ();
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
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 ();
if (size > limit)
size = limit;
+ /* Note the correct error handling here is tricky, because in the
+ * case where the call returns a zero-length buffer, it might return
+ * NULL. However it won't adjust rsize along the error path, so we
+ * can set rsize to something beforehand and use that as a flag.
+ */
+ rsize = 1;
r = guestfs_pread (g, path, size, offset, &rsize);
- if (r == NULL)
+ if (rsize == 1 && r == NULL)
return error ();
/* This should never happen, but at least it stops us overflowing