Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/bin/df change -G arg to -g.



details:   https://anonhg.NetBSD.org/src/rev/a7d3e40db9ab
branches:  trunk
changeset: 545969:a7d3e40db9ab
user:      grant <grant%NetBSD.org@localhost>
date:      Fri Apr 18 12:48:25 2003 +0000

description:
change -G arg to -g.

-G was chosen as SuSv2 specified -g was already used in ls(1), but ls
has no blocksize options like df/du, so this was redundant.

bump date in man page.

diffstat:

 bin/df/df.1 |   8 ++++----
 bin/df/df.c |  16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diffs (92 lines):

diff -r 8e9046a40ed1 -r a7d3e40db9ab bin/df/df.1
--- a/bin/df/df.1       Fri Apr 18 12:01:32 2003 +0000
+++ b/bin/df/df.1       Fri Apr 18 12:48:25 2003 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: df.1,v 1.30 2003/04/16 14:00:30 grant Exp $
+.\"    $NetBSD: df.1,v 1.31 2003/04/18 12:48:25 grant Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993
 .\"    The Regents of the University of California.  All rights reserved.
@@ -33,7 +33,7 @@
 .\"
 .\"    @(#)df.1        8.2 (Berkeley) 1/13/92
 .\"
-.Dd April 16, 2003
+.Dd April 18, 2003
 .Dt DF 1
 .Os
 .Sh NAME
@@ -75,9 +75,9 @@
 By default only filesystems mounted with the
 .Dv MNT_IGNORE
 flag clear are shown.
-.It Fl G
+.It Fl g
 The
-.Fl G
+.Fl g
 option causes the numbers to be reported in gigabytes (1024*1024*1024
 bytes).
 .It Fl h
diff -r 8e9046a40ed1 -r a7d3e40db9ab bin/df/df.c
--- a/bin/df/df.c       Fri Apr 18 12:01:32 2003 +0000
+++ b/bin/df/df.c       Fri Apr 18 12:48:25 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: df.c,v 1.46 2003/04/16 14:00:31 grant Exp $    */
+/*     $NetBSD: df.c,v 1.47 2003/04/18 12:48:25 grant Exp $    */
 
 /*
  * Copyright (c) 1980, 1990, 1993, 1994
@@ -49,7 +49,7 @@
 #if 0
 static char sccsid[] = "@(#)df.c       8.7 (Berkeley) 4/2/94";
 #else
-__RCSID("$NetBSD: df.c,v 1.46 2003/04/16 14:00:31 grant Exp $");
+__RCSID("$NetBSD: df.c,v 1.47 2003/04/18 12:48:25 grant Exp $");
 #endif
 #endif /* not lint */
 
@@ -79,7 +79,7 @@
 void    prthumanval(int64_t, char *);
 void    prthuman(struct statfs *, long);
 
-int    aflag, Gflag, hflag, iflag, kflag, lflag, mflag, nflag, Pflag;
+int    aflag, gflag, hflag, iflag, kflag, lflag, mflag, nflag, Pflag;
 char   **typelist = NULL;
 
 int
@@ -91,13 +91,13 @@
        int ch, i, maxwidth, width;
        char *mntpt;
 
-       while ((ch = getopt(argc, argv, "aGhiklmnPt:")) != -1)
+       while ((ch = getopt(argc, argv, "aghiklmnPt:")) != -1)
                switch (ch) {
                case 'a':
                        aflag = 1;
                        break;
-               case 'G':
-                       Gflag = 1;
+               case 'g':
+                       gflag = 1;
                        break;
                case 'h':
                        hflag = 1;
@@ -346,7 +346,7 @@
                        blocksize = 1024 * 1024;
                        header = Pflag ? "1048576-blocks" : "1M-blocks";
                        headerlen = strlen(header);
-               } else if (Gflag) {
+               } else if (gflag) {
                        blocksize = 1024 * 1024 * 1024;
                        header = Pflag ? "1073741824-blocks" : "1G-blocks";
                        headerlen = strlen(header);
@@ -390,7 +390,7 @@
 {
 
        (void)fprintf(stderr,
-           "Usage: %s [-aGhiklmnP] [-t type] [file | file_system ...]\n",
+           "Usage: %s [-aghiklmnP] [-t type] [file | file_system ...]\n",
            getprogname());
        exit(1);
        /* NOTREACHED */



Home | Main Index | Thread Index | Old Index