Merge of xfs-cmds-2.4.18:slinx:111473a by nathans.

  most people seem to expect the Version number option to quit after
  printing the version - make it so (previously we printed it and then
  continued running).

diff --git a/bmap/xfs_bmap.c b/bmap/xfs_bmap.c
index 88f1f45c5e8f193552d96606f4650617c5bfb343..12ebfeb5f48966e903d5f01b1bf981f1e4918ab3 100644 (file)
--- a/bmap/xfs_bmap.c
+++ b/bmap/xfs_bmap.c
@@ -83,7 +83,7 @@ main(int argc, char **argv)
                        break;
                case 'V':
                        printf("%s version %s\n", progname, VERSION);
-                       break;
+                       exit(0);
                default:
                        fprintf(stderr, "Usage: %s [-adlpV] [-n nx] file...\n",
                                        progname);

diff --git a/db/init.c b/db/init.c
index 7d679293391ac2ef5701bf2741877e32a19bc13a..a6082da5230b33f0d6cf2c6b47ed840b9d7509d7 100644 (file)
--- a/db/init.c
+++ b/db/init.c
@@ -91,7 +91,7 @@ init(
                        break;
                case 'V':
                        printf("%s version %s\n", progname, VERSION);
-                       break;
+                       exit(0);
                case '?':
                        usage();
                        /*NOTREACHED*/

diff --git a/growfs/xfs_growfs.c b/growfs/xfs_growfs.c
index fdece8cad29aa2b615723c10fa15aecd5f932e32..690de4e3f0b939f929685ab8065cbe02fde8c22f 100644 (file)
--- a/growfs/xfs_growfs.c
+++ b/growfs/xfs_growfs.c
@@ -242,7 +242,7 @@ main(int argc, char **argv)
                        break;
                case 'V':
                        printf("%s version %s\n", progname, VERSION);
-                       break;
+                       exit(0);
                case '?':
                default:
                        usage();

diff --git a/logprint/logprint.c b/logprint/logprint.c
index a6a381925f9654c6e84a5cd884d3b3591d18f978..e3a4d2d6cd555d51ae644cfdc9777e35797f3747 100644 (file)
--- a/logprint/logprint.c
+++ b/logprint/logprint.c
@@ -188,7 +188,7 @@ main(int argc, char **argv)
                        }
                        case 'V': {
                                printf("%s version %s\n", progname, VERSION);
-                               break;
+                               exit(0);
                         }
                         case 'v': {
                                 print_overwrite++;

diff --git a/mkfile/xfs_mkfile.c b/mkfile/xfs_mkfile.c
index 28df7c9dad670030ef2a7de14894e4304427e7f1..788ac2f26b67ed4f5375c21091a4821526a1f866 100644 (file)
--- a/mkfile/xfs_mkfile.c
+++ b/mkfile/xfs_mkfile.c
@@ -111,7 +111,7 @@ main(int argc, char **argv)
                                break;
                        case 'V':
                                printf("%s version %s\n", progname, VERSION);
-                               break;
+                               exit(0);
                        default:
                                errflg++;
                                break;

diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index 4bfbcb0fcce96a038d82f0ead697f5045176a98a..7d093c391ef045278e190cd13234e288f690a06f 100644 (file)
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c
@@ -890,7 +890,7 @@ main(int argc, char **argv)
                        break;
                case 'V':
                        printf("%s version %s\n", progname, VERSION);
-                       break;
+                       exit(0);
                case '?':
                        unknown(optopt, "");
                }

diff --git a/repair/xfs_repair.c b/repair/xfs_repair.c
index 1b76e075a3345614b3e98e2229edb551ad2369c3..3f417265aa2bd179f02e50542c0bd69a7800cbef 100644 (file)
--- a/repair/xfs_repair.c
+++ b/repair/xfs_repair.c
@@ -224,7 +224,7 @@ process_args(int argc, char **argv)
                        break;
                case 'V':
                        printf("%s version %s\n", progname, VERSION);
-                       break;
+                       exit(0);
                case '?':
                        usage();
                }

diff --git a/rtcp/xfs_rtcp.c b/rtcp/xfs_rtcp.c
index e31c7587494b28cf23d03ce5b226067290e85884..c69091871ff1b68f93d080799a5e7786ffd129ca 100644 (file)
--- a/rtcp/xfs_rtcp.c
+++ b/rtcp/xfs_rtcp.c
@@ -69,7 +69,7 @@ main(int argc, char **argv)
                        break;
                case 'V':
                        printf("%s version %s\n", progname, VERSION);
-                       break;
+                       exit(0);
                default:
                        errflg++;
                }