From 3d98fe634e502888163c73a22c965fba948bc328 Mon Sep 17 00:00:00 2001 From: Nathan Scott Date: Mon, 25 Feb 2002 22:30:03 +0000 Subject: [PATCH] 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). --- bmap/xfs_bmap.c | 2 +- db/init.c | 2 +- growfs/xfs_growfs.c | 2 +- logprint/logprint.c | 2 +- mkfile/xfs_mkfile.c | 2 +- mkfs/xfs_mkfs.c | 2 +- repair/xfs_repair.c | 2 +- rtcp/xfs_rtcp.c | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bmap/xfs_bmap.c b/bmap/xfs_bmap.c index 88f1f45c5..12ebfeb5f 100644 --- 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 7d6792933..a6082da52 100644 --- 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 fdece8cad..690de4e3f 100644 --- 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 a6a381925..e3a4d2d6c 100644 --- 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 28df7c9da..788ac2f26 100644 --- 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 4bfbcb0fc..7d093c391 100644 --- 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 1b76e075a..3f417265a 100644 --- 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 e31c75874..c69091871 100644 --- 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++; } -- 2.47.2