From ce48a81bce089f703a12871f98ab1240c4c3554c Mon Sep 17 00:00:00 2001 From: Bernhard Voelker Date: Thu, 22 Nov 2012 15:40:54 +0100 Subject: df: reorder default field list of --output option As the inodes information is usually not so much of interest, and some file systems including btrfs do not even provide it, reading of the full df --output is easier when the block statistic fields come just left of the last field, the mount point. * src/df.c (all_args_string): Move the inodes fields before the block fields. (usage): Likewise. * tests/df/df-output.sh: Likewise. * doc/coreutils.texi (df invocation): Likewise. Additionally, explicitly mention the default order of the --output option. --- src/df.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/df.c b/src/df.c index c62d16b50..cac26b7fb 100644 --- a/src/df.c +++ b/src/df.c @@ -193,8 +193,8 @@ static struct field_data_t field_data[] = { "target", OTHER_FLD, N_("Mounted on"), 0, MBS_ALIGN_LEFT, false } }; -static char const *all_args_string = "source,fstype,size,used,avail,pcent," - "itotal,iused,iavail,ipcent,target"; +static char const *all_args_string = + "source,fstype,itotal,iused,iavail,ipcent,size,used,avail,pcent,target"; /* Storage for the definition of output columns. */ static struct field_data_t **columns; @@ -1164,8 +1164,8 @@ Mandatory arguments to long options are mandatory for short options too.\n\ emit_size_note (); fputs (_("\n\ FIELD_LIST is a comma-separated list of columns to be included. Valid\n\ -field names are: 'source', 'fstype', 'size', 'used', 'avail', 'pcent',\n\ -'itotal', 'iused', 'iavail', 'ipcent' and 'target' (see info page).\n\ +field names are: 'source', 'fstype', 'itotal', 'iused', 'iavail', 'ipcent',\n\ +'size', 'used', 'avail', 'pcent' and 'target' (see info page).\n\ "), stdout); emit_ancillary_info (); } -- cgit v1.2.3-54-g00ecf