Merge commit 'origin/master'

Conflicts:
	AUTHORS
	NEWS
	config/include-Makefile.am
	configure.ac
	mount/lomount.c
	po/POTFILES.in
	po/ca.po
	po/cs.po
	po/da.po
	po/de.po
	po/es.po
	po/et.po
	po/eu.po
	po/fi.po
	po/fr.po
	po/hu.po
	po/id.po
	po/it.po
	po/ja.po
	po/nl.po
	po/pl.po
	po/pt_BR.po
	po/ru.po
	po/sl.po
	po/sv.po
	po/tr.po
	po/uk.po
	po/util-linux-ng.pot
	po/vi.po
	po/zh_CN.po

1 files changed, 77 insertions, 0 deletions

diff --git a/misc-utils/uuidgen.c b/misc-utils/uuidgen.c
new file mode 100644
index 00000000..3cf6ec91
--- /dev/null
+++ b/misc-utils/uuidgen.c
@@ -0,0 +1,77 @@
+/*
+ * gen_uuid.c --- generate a DCE-compatible uuid
+ *
+ * Copyright (C) 1999, Andreas Dilger and Theodore Ts'o
+ *
+ * %Begin-Header%
+ * This file may be redistributed under the terms of the GNU Public
+ * License.
+ * %End-Header%
+ */
+
+#include <stdio.h>
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#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
+
+#include "uuid.h"
+#include "nls.h"
+
+#define DO_TYPE_TIME	1
+#define DO_TYPE_RANDOM	2
+
+static void usage(const char *progname)
+{
+	fprintf(stderr, _("Usage: %s [-r] [-t]\n"), progname);
+	exit(1);
+}
+
+int
+main (int argc, char *argv[])
+{
+	int    c;
+	int    do_type = 0;
+	char   str[37];
+	uuid_t uu;
+
+	setlocale(LC_ALL, "");
+	bindtextdomain(PACKAGE, LOCALEDIR);
+	textdomain(PACKAGE);
+
+	while ((c = getopt (argc, argv, "tr")) != EOF)
+		switch (c) {
+		case 't':
+			do_type = DO_TYPE_TIME;
+			break;
+		case 'r':
+			do_type = DO_TYPE_RANDOM;
+			break;
+		default:
+			usage(argv[0]);
+		}
+
+	switch (do_type) {
+	case DO_TYPE_TIME:
+		uuid_generate_time(uu);
+		break;
+	case DO_TYPE_RANDOM:
+		uuid_generate_random(uu);
+		break;
+	default:
+		uuid_generate(uu);
+		break;
+	}
+
+	uuid_unparse(uu, str);
+
+	printf("%s\n", str);
+
+	return 0;
+}