Whamcloud - gitweb
git://git.whamcloud.com
/
tools
/
e2fsprogs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libext2fs: fix a coding style for EXT2_NO_MTAB_FILE
[tools/e2fsprogs.git]
/
misc
/
uuidgen.c
diff --git
a/misc/uuidgen.c
b/misc/uuidgen.c
index
b6f3837
..
f181d19
100644
(file)
--- a/
misc/uuidgen.c
+++ b/
misc/uuidgen.c
@@
-9,10
+9,15
@@
* %End-Header%
*/
* %End-Header%
*/
+#include "config.h"
#include <stdio.h>
#include <stdio.h>
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
#ifdef HAVE_GETOPT_H
#include <getopt.h>
#else
#ifdef HAVE_GETOPT_H
#include <getopt.h>
#else
+extern int getopt(int argc, char * const argv[], const char *optstring);
extern char *optarg;
extern int optind;
#endif
extern char *optarg;
extern int optind;
#endif
@@
-22,7
+27,7
@@
extern int optind;
#define DO_TYPE_TIME 1
#define DO_TYPE_RANDOM 2
#define DO_TYPE_TIME 1
#define DO_TYPE_RANDOM 2
-void usage(const char *progname)
+
static
void usage(const char *progname)
{
fprintf(stderr, _("Usage: %s [-r] [-t]\n"), progname);
exit(1);
{
fprintf(stderr, _("Usage: %s [-r] [-t]\n"), progname);
exit(1);
@@
-36,6
+41,13
@@
main (int argc, char *argv[])
char str[37];
uuid_t uu;
char str[37];
uuid_t uu;
+#ifdef ENABLE_NLS
+ setlocale(LC_MESSAGES, "");
+ setlocale(LC_CTYPE, "");
+ bindtextdomain(NLS_CAT_NAME, LOCALEDIR);
+ textdomain(NLS_CAT_NAME);
+#endif
+
while ((c = getopt (argc, argv, "tr")) != EOF)
switch (c) {
case 't':
while ((c = getopt (argc, argv, "tr")) != EOF)
switch (c) {
case 't':
@@
-47,7
+59,7
@@
main (int argc, char *argv[])
default:
usage(argv[0]);
}
default:
usage(argv[0]);
}
-
+
switch (do_type) {
case DO_TYPE_TIME:
uuid_generate_time(uu);
switch (do_type) {
case DO_TYPE_TIME:
uuid_generate_time(uu);
@@
-59,7
+71,7
@@
main (int argc, char *argv[])
uuid_generate(uu);
break;
}
uuid_generate(uu);
break;
}
-
+
uuid_unparse(uu, str);
printf("%s\n", str);
uuid_unparse(uu, str);
printf("%s\n", str);