include/pidfd-utils: remove hardcoded syscall fallback

[thirdparty/util-linux.git] / misc-utils / mcookie.c

diff --git a/misc-utils/mcookie.c b/misc-utils/mcookie.c
index 8598ac3452dffedd398f21d2b6f687fff94ded21..99df4f4a6d973d8dad5b102553fe3da3088b8693 100644 (file)
--- a/misc-utils/mcookie.c
+++ b/misc-utils/mcookie.c
@@ -1,9 +1,13 @@
-/* mcookie.c -- Generates random numbers for xauth
+/*
+ * No copyright is claimed.  This code is in the public domain; do with
+ * it what you wish.
+ *
+ * mcookie.c -- Generates random numbers for xauth
  * Created: Fri Feb  3 10:42:48 1995 by faith@cs.unc.edu
  * Revised: Fri Mar 19 07:48:01 1999 by faith@acm.org
  * Public Domain 1995, 1999 Rickard E. Faith (faith@acm.org)
  * This program comes with ABSOLUTELY NO WARRANTY.
- * 
+ *
  * This program gathers some random bits of data and used the MD5
  * message-digest algorithm to generate a 128-bit hexadecimal number for
  * use with xauth(1).
@@ -65,7 +69,7 @@ static uint64_t hash_file(struct mcookie_control *ctl, int fd)
                        rdsz = wanted - count;
 
                r = read_all(fd, (char *) buf, rdsz);
-               if (r < 0)
+               if (r <= 0)
                        break;
                ul_MD5Update(&ctl->ctx, buf, r);
                count += r;
@@ -91,8 +95,12 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(" -v, --verbose         explain what is being done\n"), out);
 
        fputs(USAGE_SEPARATOR, out);
-       printf(USAGE_HELP_OPTIONS(23));
-       printf(USAGE_MAN_TAIL("mcookie(1)"));
+       fprintf(out, USAGE_HELP_OPTIONS(23));
+
+       fputs(USAGE_ARGUMENTS, out);
+       fprintf(out, USAGE_ARG_SIZE(_("<num>")));
+
+       fprintf(out, USAGE_MAN_TAIL("mcookie(1)"));
 
        exit(EXIT_SUCCESS);
 }
@@ -147,7 +155,7 @@ int main(int argc, char **argv)
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        while ((c = getopt_long(argc, argv, "f:m:vVh", longopts, NULL)) != -1) {
                switch (c) {
@@ -163,9 +171,9 @@ int main(int argc, char **argv)
                        ctl.maxsz = strtosize_or_err(optarg,
                                                     _("failed to parse length"));
                        break;
+
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
+                       print_version(EXIT_SUCCESS);
                case 'h':
                        usage();
                default:
@@ -180,7 +188,7 @@ int main(int argc, char **argv)
        randomness_from_files(&ctl);
        free(ctl.files);
 
-       random_get_bytes(&buf, RAND_BYTES);
+       ul_random_get_bytes(&buf, RAND_BYTES);
        ul_MD5Update(&ctl.ctx, buf, RAND_BYTES);
        if (ctl.verbose)
                fprintf(stderr, P_("Got %d byte from %s\n",