OSSP CVS Repository

ossp - Check-in [4414]
Not logged in
[Honeypot]  [Browse]  [Home]  [Login]  [Reports
[Search]  [Ticket]  [Timeline
  [Patchset]  [Tagging/Branching

Check-in Number: 4414
Date: 2004-Feb-13 15:29:32 (local)
2004-Feb-13 14:29:32 (UTC)
User:rse
Branch:
Comment: Fixed "uuid -h" command.

Submitted by: fuyuki@nigredo.org

Tickets:
Inspections:
Files:
ossp-pkg/uuid/ChangeLog      1.37 -> 1.38     4 inserted, 1 deleted
ossp-pkg/uuid/uuid_cli.c      1.14 -> 1.15     6 inserted, 2 deleted
ossp-pkg/uuid/uuid_cli.pod      1.13 -> 1.14     1 inserted, 1 deleted

ossp-pkg/uuid/ChangeLog 1.37 -> 1.38

--- ChangeLog    2004/02/11 14:53:00     1.37
+++ ChangeLog    2004/02/13 14:29:32     1.38
@@ -11,7 +11,10 @@
   This is a list of all changes to OSSP uuid.
   For a more brief summary please have a look at the NEWS file.
 
-  Changes between 0.9.5 and 0.9.6 (06-Feb-2004 to 11-Feb-2004)
+  Changes between 0.9.5 and 0.9.6 (06-Feb-2004 to 13-Feb-2004)
+
+   o Fixed "uuid -h" command.
+     [Ralf S. Engelschall, <fuyuki@nigredo.org>]
 
    o Added an experimental additional DCE 1.1 API for backward
      compatibility with existing applications.


ossp-pkg/uuid/uuid_cli.c 1.14 -> 1.15

--- uuid_cli.c   2004/01/19 14:11:50     1.14
+++ uuid_cli.c   2004/02/13 14:29:32     1.15
@@ -62,7 +62,8 @@
         vfprintf(stderr, str, ap);
         fprintf(stderr, "\n");
     }
-    fprintf(stderr, "usage: uuid [-1] [-n count] [-a] [-d] [-o filename] [UUID]\n");
+    fprintf(stderr, "usage: uuid [-v version] [-m] [-n count] [-1] [-r] [-o filename] [namespace-name]\n");
+    fprintf(stderr, "usage: uuid -d [-r] [-o filename] [uuid]\n");
     va_end(ap);
     exit(1);
 }
@@ -92,7 +93,7 @@
     raw = 0;        /* default is ASCII output */
     decode = 0;     /* default is to encode */
     version = UUID_MAKE_V1;
-    while ((ch = getopt(argc, argv, "1n:rdmo:v:")) != -1) {
+    while ((ch = getopt(argc, argv, "1n:rdmo:v:h")) != -1) {
         switch (ch) {
             case '1':
                 iterate = 1;
@@ -132,6 +133,9 @@
                         break;
                 }
                 break;
+            case 'h':
+                usage(NULL);
+                break;
             default:
                 usage("invalid option '%c'", optopt);
         }


ossp-pkg/uuid/uuid_cli.pod 1.13 -> 1.14

--- uuid_cli.pod 2004/01/19 14:11:50     1.13
+++ uuid_cli.pod 2004/02/13 14:29:32     1.14
@@ -52,7 +52,7 @@
 B<-d>
 [B<-r>]
 [B<-o> I<filename>]
-[I<uuid>]
+I<uuid>
 
 =head1 DESCRIPTION
 

CVSTrac 2.0.1