git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Set locale in C programs so l10n works (RHBZ#559962).
[libguestfs.git]
/
fuse
/
guestmount.c
diff --git
a/fuse/guestmount.c
b/fuse/guestmount.c
index
ed8b08c
..
c935493
100644
(file)
--- a/
fuse/guestmount.c
+++ b/
fuse/guestmount.c
@@
-441,6
+441,7
@@
fg_rename (const char *from, const char *to)
if (read_only) return -EROFS;
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
dir_cache_invalidate (to);
/* XXX It's not clear how close the 'mv' command is to the
@@
-533,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;
time_t mtsecs = ts[1].tv_sec;
long mtnsecs = ts[1].tv_nsec;
+#ifdef UTIME_NOW
if (atnsecs == UTIME_NOW)
atnsecs = -1;
if (atnsecs == UTIME_NOW)
atnsecs = -1;
+#endif
+#ifdef UTIME_OMIT
if (atnsecs == UTIME_OMIT)
atnsecs = -2;
if (atnsecs == UTIME_OMIT)
atnsecs = -2;
+#endif
+#ifdef UTIME_NOW
if (mtnsecs == UTIME_NOW)
mtnsecs = -1;
if (mtnsecs == UTIME_NOW)
mtnsecs = -1;
+#endif
+#ifdef UTIME_OMIT
if (mtnsecs == UTIME_OMIT)
mtnsecs = -2;
if (mtnsecs == UTIME_OMIT)
mtnsecs = -2;
+#endif
r = guestfs_utimens (g, path, atsecs, atnsecs, mtsecs, mtnsecs);
if (r == -1)
r = guestfs_utimens (g, path, atsecs, atnsecs, mtsecs, mtnsecs);
if (r == -1)
@@
-849,7
+858,7
@@
fuse_help (void)
{
const char *tmp_argv[] = { program_name, "--help", NULL };
fuse_main (2, (char **) tmp_argv, &fg_operations, NULL);
{
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))
}
static void __attribute__((noreturn))
@@
-887,6
+896,10
@@
usage (int status)
int
main (int argc, char *argv[])
{
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
enum { HELP_OPTION = CHAR_MAX + 1 };
/* The command line arguments are broadly compatible with (a subset
@@
-927,7
+940,7
@@
main (int argc, char *argv[])
fuse_argv = realloc (fuse_argv, (1+fuse_argc) * sizeof (char *)); \
if (!fuse_argv) { \
perror ("realloc"); \
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; \
} \
fuse_argv[fuse_argc-1] = (str); \
fuse_argv[fuse_argc] = NULL; \
@@
-950,7
+963,7
@@
main (int argc, char *argv[])
g = guestfs_create ();
if (g == NULL) {
fprintf (stderr, _("guestfs_create: failed to create handle\n"));
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);
}
guestfs_set_autosync (g, 1);
@@
-996,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);
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);
}
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");
}
drv = malloc (sizeof (struct drv));
if (!drv) {
perror ("malloc");
- exit (
1
);
+ exit (
EXIT_FAILURE
);
}
drv->filename = optarg;
drv->next = drvs;
}
drv->filename = optarg;
drv->next = drvs;
@@
-1019,7
+1032,7
@@
main (int argc, char *argv[])
mp = malloc (sizeof (struct mp));
if (!mp) {
perror ("malloc");
mp = malloc (sizeof (struct mp));
if (!mp) {
perror ("malloc");
- exit (
1
);
+ exit (
EXIT_FAILURE
);
}
p = strchr (optarg, ':');
if (p) {
}
p = strchr (optarg, ':');
if (p) {
@@
-1052,13
+1065,13
@@
main (int argc, char *argv[])
case 'V':
printf ("%s %s\n", program_name, PACKAGE_VERSION);
case 'V':
printf ("%s %s\n", program_name, PACKAGE_VERSION);
- exit (
0
);
+ exit (
EXIT_SUCCESS
);
case HELP_OPTION:
case HELP_OPTION:
- usage (
0
);
+ usage (
EXIT_SUCCESS
);
default:
default:
- usage (
1
);
+ usage (
EXIT_FAILURE
);
}
}
}
}
@@
-1067,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);
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. */
}
/* We'd better have a mountpoint. */
@@
-1075,18
+1088,18
@@
main (int argc, char *argv[])
fprintf (stderr,
_("%s: you must specify a mountpoint in the host filesystem\n"),
program_name);
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)
}
/* 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)
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
/* At the last minute, remove the libguestfs error handler. In code
* above this point, the default error handler has been used which
@@
-1135,7
+1148,7
@@
add_drives (struct drv *drv)
else
r = guestfs_add_drive_ro (g, drv->filename);
if (r == -1)
else
r = guestfs_add_drive_ro (g, drv->filename);
if (r == -1)
- exit (
1
);
+ exit (
EXIT_FAILURE
);
}
}
}
}
@@
-1152,6
+1165,6
@@
mount_mps (struct mp *mp)
else
r = guestfs_mount_ro (g, mp->device, mp->mountpoint);
if (r == -1)
else
r = guestfs_mount_ro (g, mp->device, mp->mountpoint);
if (r == -1)
- exit (
1
);
+ exit (
EXIT_FAILURE
);
}
}
}
}