Changeset 342 for branches/samba-3.3.x/source/client

Timestamp:

Oct 30, 2009, 9:39:05 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.3 to 3.3.9

File:

• branches/samba-3.3.x/source/client/mount.cifs.c (modified) (3 diffs)

branches/samba-3.3.x/source/client/mount.cifs.c

@@ -1037 +1037 @@
 }
 
+static void print_cifs_mount_version(void)
+{
+        printf("mount.cifs version: %s.%s%s\n",
+                MOUNT_CIFS_VERSION_MAJOR,
+                MOUNT_CIFS_VERSION_MINOR,
+                MOUNT_CIFS_VENDOR_SUFFIX);
+}
+
 int main(int argc, char ** argv)
 {
@@ -1098 +1106 @@
                 }
                 mountpoint = argv[2];
+        } else if (argc == 2) {
+                if ((strcmp(argv[1], "-V") == 0) ||
+                    (strcmp(argv[1], "--version") == 0))
+                {
+                        print_cifs_mount_version();
+                        exit(0);
+                }
+
+                if ((strcmp(argv[1], "-h") == 0) ||
+                    (strcmp(argv[1], "-?") == 0) ||
+                    (strcmp(argv[1], "--help") == 0))
+                {
+                        mount_cifs_usage();
+                        exit(0);
+                }
+
+                mount_cifs_usage();
+                exit(EX_USAGE);
         } else {
-                if ((strcmp (argv[1], "--version") == 0) ||
-                    ((strcmp (argv[1], "-V") == 0))) {
-                        printf ("mount.cifs version: %s.%s%s\n",
-                        MOUNT_CIFS_VERSION_MAJOR,
-                        MOUNT_CIFS_VERSION_MINOR,
-                        MOUNT_CIFS_VENDOR_SUFFIX);
-                        exit (0);
-                }
                 mount_cifs_usage();
                 exit(EX_USAGE);
@@ -1162 +1180 @@
                         ++verboseflag;
                         break;
-                case 'V':          
-                        printf ("mount.cifs version: %s.%s%s\n",
-                        MOUNT_CIFS_VERSION_MAJOR,
-                        MOUNT_CIFS_VERSION_MINOR,
-                        MOUNT_CIFS_VENDOR_SUFFIX);
+                case 'V':
+                        print_cifs_mount_version();
                         exit (0);
                 case 'w':