summaryrefslogtreecommitdiffstats
path: root/text-utils/column.c
diff options
context:
space:
mode:
authorKarel Zak2017-03-01 12:25:16 +0100
committerKarel Zak2017-03-01 12:25:16 +0100
commit3e094e5fe2b9949506cb0e65b9d25aa8c628751f (patch)
tree0742e902af0f37eedb9913f9b5eaeca42863396f /text-utils/column.c
parentlibmount: cosmetic change to mnt_table_find_srcpath() (diff)
downloadkernel-qcow2-util-linux-3e094e5fe2b9949506cb0e65b9d25aa8c628751f.tar.gz
kernel-qcow2-util-linux-3e094e5fe2b9949506cb0e65b9d25aa8c628751f.tar.xz
kernel-qcow2-util-linux-3e094e5fe2b9949506cb0e65b9d25aa8c628751f.zip
column: make more obvious what is default behavior
The man page contains mistakes. The default is to fill columns before lines: $ printf 'aaaaaaaaaaaaaaaaaaaaaa\nBBBBBBBBBBBBBBBBBBBBB\nXXXXXXX\nYYYYYYYYYYY\nZZZZZ' > data $ column --columns 80 < data aaaaaaaaaaaaaaaaaaaaaa XXXXXXX ZZZZZ BBBBBBBBBBBBBBBBBBBBB YYYYYYYYYYY $ column --fillrows --columns 80 < data aaaaaaaaaaaaaaaaaaaaaa BBBBBBBBBBBBBBBBBBBBB XXXXXXX YYYYYYYYYYY ZZZZZ The patch also rename functions in the code to make it more obvious for code readers. Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'text-utils/column.c')
-rw-r--r--text-utils/column.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/text-utils/column.c b/text-utils/column.c
index 3d50f2e27..385245f01 100644
--- a/text-utils/column.c
+++ b/text-utils/column.c
@@ -71,8 +71,8 @@ static char *mtsafe_strtok(char *, const char *, char **);
#define MAXLINELEN (LINE_MAX + 1)
static int input(FILE *fp, int *maxlength, wchar_t ***list, int *entries);
-static void c_columnate(int maxlength, long termwidth, wchar_t **list, int entries);
-static void r_columnate(int maxlength, long termwidth, wchar_t **list, int entries);
+static void columnate_fillrows(int maxlength, long termwidth, wchar_t **list, int entries);
+static void columnate_fillcols(int maxlength, long termwidth, wchar_t **list, int entries);
static wchar_t *local_wcstok(wchar_t *p, const wchar_t *separator, int greedy, wchar_t **wcstok_state);
static void maketbl(wchar_t **list, int entries, wchar_t *separator, int greedy, wchar_t *colsep);
static void print(wchar_t **list, int entries);
@@ -225,9 +225,9 @@ int main(int argc, char **argv)
else if (maxlength >= termwidth)
print(list, entries);
else if (xflag)
- c_columnate(maxlength, termwidth, list, entries);
+ columnate_fillrows(maxlength, termwidth, list, entries);
else
- r_columnate(maxlength, termwidth, list, entries);
+ columnate_fillcols(maxlength, termwidth, list, entries);
for (i = 0; i < entries; i++)
free(list[i]);
@@ -239,7 +239,7 @@ int main(int argc, char **argv)
return EXIT_FAILURE;
}
-static void c_columnate(int maxlength, long termwidth, wchar_t **list, int entries)
+static void columnate_fillrows(int maxlength, long termwidth, wchar_t **list, int entries)
{
int chcnt, col, cnt, endcol, numcols;
wchar_t **lp;
@@ -268,7 +268,7 @@ static void c_columnate(int maxlength, long termwidth, wchar_t **list, int entri
putwchar('\n');
}
-static void r_columnate(int maxlength, long termwidth, wchar_t **list, int entries)
+static void columnate_fillcols(int maxlength, long termwidth, wchar_t **list, int entries)
{
int base, chcnt, cnt, col, endcol, numcols, numrows, row;