ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
15,137 Commits 31 Branches 178 Tags 180 MiB
Commit Graph

50 Commits

Author SHA1 Message Date
Karel Zak 045e7efabd libsmartcols: (sample) remove unused variable 
Signed-off-by: Karel Zak <kzak@redhat.com>
 2020-07-14 12:32:56 +02:00
Karel Zak 04e6ab9c1b libsmartcols: (sample) remove unnecessary check [coverity scan] 
@str cannot be NULL ...

Signed-off-by: Karel Zak <kzak@redhat.com>
 2020-07-14 12:21:22 +02:00
Karel Zak f3a55c1fde libsmartcols: (sample) check scols_line_refer_data() return code [coverity scan] 
Signed-off-by: Karel Zak <kzak@redhat.com>
 2020-07-14 12:18:01 +02:00
Karel Zak 59ba65df21 libsmartcols: (smaple) check scols_line_set_data() return code [coverity scan] 
Signed-off-by: Karel Zak <kzak@redhat.com>
 2020-07-14 12:03:11 +02:00
Karel Zak 8aedaf592e libsmartcols: (sample) check scols_line_set_data() return code [coverity scan] 
Signed-off-by: Karel Zak <kzak@redhat.com>
 2020-07-14 11:36:23 +02:00
Karel Zak 94dbb32273 libsmartcols: cleanup and extend padding functionality 
LIBSMARTCOLS_DEBUG_PADDING=on in the next examples forces libsmartcols
print '.' as a padding char. See line "ffff" in the exmaples.

* default output is to fill all except last cell

	$ LIBSMARTCOLS_DEBUG_PADDING=on ./sample-scols-fromfile --nlines 10  --width 80 --column tests/ts/libsmartcols/files/col-name --column tests/ts/libsmartcols/files/col-number --column tests/ts/libsmartcols/files/col-string --column tests/ts/libsmartcols/files/col-string tests/ts/libsmartcols/files/data-string tests/ts/libsmartcols/files/data-number tests/ts/libsmartcols/files/data-string-empty tests/ts/libsmartcols/files/data-string-empty 2> /dev/null
	NAME.. ......NUM STRINGS STRINGS
	aaaa.. ........0 aaaa... aaaa
	bbb... ......100 bbb.... bbb
	ccccc. .......21 ccccc.. ccccc
	dddddd ........3 dddddd. dddddd
	ee.... ......411 ee..... ee
	ffff.. .....5111 .......
	gggggg 678993321 gggggg. gggggg
	hhh... ..7666666 hhh.... hhh

* scols_table_enable_minout() minimizes output for tailing empty cells, example:

	$ LIBSMARTCOLS_DEBUG_PADDING=on ./sample-scols-fromfile --nlines 10 --minout  --width 80 --column tests/ts/libsmartcols/files/col-name --column tests/ts/libsmartcols/files/col-number --column tests/ts/libsmartcols/files/col-string --column tests/ts/libsmartcols/files/col-string tests/ts/libsmartcols/files/data-string tests/ts/libsmartcols/files/data-number tests/ts/libsmartcols/files/data-string-empty tests/ts/libsmartcols/files/data-string-empty 2> /dev/null
	NAME.. ......NUM STRINGS STRINGS
	aaaa.. ........0 aaaa... aaaa
	bbb... ......100 bbb.... bbb
	ccccc. .......21 ccccc.. ccccc
	dddddd ........3 dddddd. dddddd
	ee.... ......411 ee..... ee
	ffff.. .....5111
	gggggg 678993321 gggggg. gggggg
	hhh... ..7666666 hhh.... hhh

* cleanup up scols_table_enable_maxout() use, example:

	$ LIBSMARTCOLS_DEBUG_PADDING=on ./sample-scols-fromfile --nlines 10 --maxout  --width 80 --column tests/ts/libsmartcols/files/col-name --column tests/ts/libsmartcols/files/col-number --column tests/ts/libsmartcols/files/col-string --column tests/ts/libsmartcols/files/col-string tests/ts/libsmartcols/files/data-string tests/ts/libsmartcols/files/data-number tests/ts/libsmartcols/files/data-string-empty tests/ts/libsmartcols/files/data-string-empty 2> /dev/null
	NAME.............. ..................NUM STRINGS............ STRINGS............
	aaaa.............. ....................0 aaaa............... aaaa...............
	bbb............... ..................100 bbb................ bbb................
	ccccc............. ...................21 ccccc.............. ccccc..............
	dddddd............ ....................3 dddddd............. dddddd.............
	ee................ ..................411 ee................. ee.................
	ffff.............. .................5111 ................... ...................
	gggggg............ ............678993321 gggggg............. gggggg.............
	hhh............... ..............7666666 hhh................ hhh................

Note that we cannot make scols_table_enable_minout() default because
for example "column --table" is pretty commonly used with non-blank
columns separator and in this case all cells has to be filled.

	$ echo -e "aa,b,ccc\na,,\naaa,bbb,ccc" |  column --table --separator ',' --output-separator '|'
	aa |b  |ccc
	a  |   |
	aaa|bbb|ccc

Addresses: https://github.com/karelzak/util-linux/issues/826
Signed-off-by: Karel Zak <kzak@redhat.com>
 2019-07-23 16:24:42 +02:00
Karel Zak 309c76e4ee libsmartcols: add grouping samples 
Signed-off-by: Karel Zak <kzak@redhat.com>
 2018-12-07 12:33:34 +01:00
Karel Zak 8aeda56b5d sample-scols-title: add left title without padding 
Signed-off-by: Karel Zak <kzak@redhat.com>
 2017-12-12 13:16:54 +01:00
Karel Zak d1bf0ce5fa libsmartcols: fix mem-leaks in samples 
Signed-off-by: Karel Zak <kzak@redhat.com>
 2017-11-23 15:24:59 +01:00
Karel Zak f086478af4 libsmartcols: (sample) cleanup line separator usage 
* add comment to explain when nolinesep flag is necessary
* force to print \n before switch to the next line to support

	  ./sample-scols-continuous > file

use case.

Addresses: https://github.com/ignatenkobrain/python-smartcols/issues/18
Signed-off-by: Karel Zak <kzak@redhat.com>
 2017-10-12 12:03:57 +02:00
Ruediger Meier 6e1eda6f22 misc: never use usage(stderr) 
Here we fix all cases where we have usage(FILE*)
functions.

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
 2017-06-26 14:38:24 +02:00
Ruediger Meier c0d7b11a3f build-sys: fix library order when linking 
We got some errors on Alpine Linux where $LTLIBINTL is non-empty:

./.libs/libcommon.a(libcommon_la-blkdev.o): In function `open_blkdev_or_file':
lib/blkdev.c:282: undefined reference to `libintl_gettext
collect2: error: ld returned 1 exit status

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
 2017-06-01 03:16:48 +02:00
Sami Kerola 71f08e9706
tests: do not use plain 0 as NULL [smatch scan] 
Likewise commit 8791804065.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
 2017-03-17 21:22:26 +00:00
Sami Kerola 4ff3d13b43
libsmartcols: fix test variable shadowing 
libsmartcols/samples/fromfile.c:57:16: warning: declaration of 'flags'
shadows a global declaration [-Wshadow]
libsmartcols/samples/fromfile.c:29:33: note: shadowed declaration is here
libsmartcols/samples/fromfile.c:101:8: warning: declaration of 'flags'
shadows a global declaration [-Wshadow]

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
 2017-03-17 21:22:26 +00:00
Yuri Chornoivan a7349ee315 docs: Fix word repetitions 2017-02-13 14:10:12 +01:00
Ruediger Meier 332123f2b6 misc: fix some compiler warnings 
libsmartcols/samples/fromfile.c:59:2: warning: passing argument 3 of 'string_to_bitmask' from incompatible pointer type
  text-utils/pg.c:79:0: warning: "TABSIZE" redefined
  libblkid/src/read.c:455:13: warning: 'debug_dump_dev' defined but not used [-Wunused-function]
  libblkid/src/probe.c:769:13: warning: unused function 'cdrom_size_correction' [-Wunused-function]
  /usr/include/sys/termios.h:3:2: warning: "this file includes <sys/termios.h> which is deprecated, use <termios.h> instead" [-W#warnings]

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
 2016-10-27 11:03:24 +02:00
Karel Zak 949ea05f1a libsmartcols: support custom wrap and remove SCOLS_FL_WRAPNL 
This new API provides full control on multi-line cells, you can wrap
text by new lines (build-in support) or by another way (after words,
commas, etc.) Changes:

* new scols_column_set_wrapfunc() sets pointers to two callback functions

   1/ chunksize() - returns largest data chunk size; used when we
                    calculate columns width
   2/ nextchunk() - terminate the current chunk and returns pointer to
                    the next; used when we print data

* remove SCOLS_FL_WRAPNL and add new functions scols_wrapnl_chunksize()
  and scols_wrapnl_nextchunk() to provide build-in functionality to
  wrap cells on \n

* remove scols_column_is_wrapnl() add scols_column_is_customwrap()
  (returns true if custom wrap functions are defined)

* add scols_column_set_safechars() and scols_column_get_safechars() to
  allow to control output encoding, safe chars are not encoded by \xFOO

* modify "fromfile" test code to use build-in scols_wrapnl_* callbacks
  for "wrapnl" tests

* add new function scols_column_get_table()

Signed-off-by: Karel Zak <kzak@redhat.com>
 2016-09-26 11:20:07 +02:00
Karel Zak 695fd479be tests: add columns separator to libsmartcols test 
Signed-off-by: Karel Zak <kzak@redhat.com>
 2016-09-16 14:18:01 +02:00
Karel Zak 4a2b50f238 tests: add export and raw to libsmartcols test 
Signed-off-by: Karel Zak <kzak@redhat.com>
 2016-09-16 13:49:37 +02:00
Karel Zak 6a82714dbf libsmartcols: add JSON support to sample application 
Signed-off-by: Karel Zak <kzak@redhat.com>
 2016-09-16 13:30:29 +02:00
Karel Zak 18ff51547d libsmartcols: add support for trees to the sample application 
Signed-off-by: Karel Zak <kzak@redhat.com>
 2016-09-15 12:12:18 +02:00
Karel Zak 36eb51ebb4 tests: add libsmartcols title test 
Signed-off-by: Karel Zak <kzak@redhat.com>
 2016-09-14 12:49:46 +02:00
Karel Zak 6db10580ca build-sys: remove dead libsmartcols sample 
Signed-off-by: Karel Zak <kzak@redhat.com>
 2016-09-13 16:50:10 +02:00
Karel Zak a414a17093 tests: improve libsmartcols test 
Signed-off-by: Karel Zak <kzak@redhat.com>
 2016-09-13 14:12:11 +02:00
Karel Zak fa4691833a libsmartcols: add application to test library features 
Signed-off-by: Karel Zak <kzak@redhat.com>
 2016-09-13 13:08:02 +02:00
Karel Zak a2b8ad291f libsmartcols: extend wrapnl sample 
Signed-off-by: Karel Zak <kzak@redhat.com>
 2016-09-06 13:01:45 +02:00
Karel Zak 4f07ff4041 libsmartcols: remove debuging code from sample 
Signed-off-by: Karel Zak <kzak@redhat.com>
 2016-09-06 12:24:49 +02:00
Karel Zak 6cd398642b libsmartcols: commit missing file 
Signed-off-by: Karel Zak <kzak@redhat.com>
 2016-09-06 11:18:18 +02:00
Karel Zak ff471d89a1 libsmartcols: support multi-line cells based on line breaks 
Now libsmartcols completely control when and how wrap long
lines/cells. This is sometimes user unfriendly and it would be nice to
support multi-line cells where wrap is based on \n (new line char).

This patch add new column flag SCOLS_FL_WRAPNL.

Signed-off-by: Karel Zak <kzak@redhat.com>
 2016-09-06 10:51:25 +02:00
Karel Zak b54439cbad libsmartcols: use SCOLS_FL_RIGHT in sample 
Signed-off-by: Karel Zak <kzak@redhat.com>
 2016-08-31 15:51:03 +02:00
Karel Zak 51962c95e3 libsmartcols: add maxout sample 
Signed-off-by: Karel Zak <kzak@redhat.com>
 2016-08-31 15:15:28 +02:00
Karel Zak 066779c67b libsmartcols: fix scols_table_enable_colors() usage in samples 
Signed-off-by: Karel Zak <kzak@redhat.com>
 2016-08-31 12:05:48 +02:00
Sebastian Rasmussen 9e93004171 misc: Fix various typos 
Fix various typos in error messages, warnings, debug strings,
comments and names of static functions.

Signed-off-by: Sebastian Rasmussen <sebras@gmail.com>
 2016-05-31 23:40:21 +02:00
Ruediger Meier dc0495166f build-sys: add and use openat build conditionals 
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
 2016-03-07 15:37:25 +01:00
Karel Zak b64dc52a53 Merge branch 'ldadd-cflags-warnings' of https://github.com/rudimeier/util-linux 
* 'ldadd-cflags-warnings' of https://github.com/rudimeier/util-linux:
  build-sys: disable unused parameter warnings for some test progs
  misc: fix compiler warnungs (unsigned/signed)
  misc: fix warnings "unused parameter" [-Wunused-parameter]
  libfdisk: fix warnings, "redundant redeclaration" [-Wredundant-decls]
  tests: fix compiler warnings [-Wmissing-prototypes]
  libfdisk: fix compiler warnings [-Wmissing-prototypes]
  libfdisk: fix missing symbol
  libblkid: fix compiler warnings [-Wmissing-prototypes]
  libmount: add mnt_fs_set_priority()
  build-sys: always add AM_CFLAGS
  build-sys: always use global LDADD
 2016-02-24 13:51:10 +01:00
Karel Zak cbe3e49535 libsmartcols: fix relative column width for maxout 
Signed-off-by: Karel Zak <kzak@redhat.com>
 2016-02-24 12:34:37 +01:00
Ruediger Meier 2013b33f40 build-sys: disable unused parameter warnings for some test progs 
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
 2016-02-23 03:20:22 +01:00
Ruediger Meier 5fde1d9f06 tests: fix compiler warnings [-Wmissing-prototypes] 
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
 2016-02-23 03:18:09 +01:00
Ruediger Meier b0b54cc582 build-sys: always add AM_CFLAGS 
We were missing our nice compliler warnings for many programs
and libs. See next commits how many trivial and non-trival
warnings have to be fixed.

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
 2016-02-23 01:17:29 +01:00
Ruediger Meier b201f1d86c build-sys: always use global LDADD 
This was a major showstopper when building on a system where
LTLIBINTL libs are needed (e.g. OSX). Maybe there are a few test
programs which wouldn't need LDADD ... never mind.

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
 2016-02-23 01:16:58 +01:00
Karel Zak 12ca9cb1f5 libsmartcols: add sample-scols-continuous 
Signed-off-by: Karel Zak <kzak@redhat.com>
 2016-02-19 16:47:38 +01:00
Karel Zak 2a750b4c4e libsmartcols: add scols_table_print_range() 
Signed-off-by: Karel Zak <kzak@redhat.com>
 2016-02-19 14:43:06 +01:00
Ruediger Meier b0b24b11f8 lib: rename strmode() and setmode() 
On BSD they are part of the standard C library.

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
 2016-02-18 12:53:48 +01:00
Karel Zak 20759a42ec libsmartcols: rewrite ./sample-scols-wrap 
Signed-off-by: Karel Zak <kzak@redhat.com>
 2016-02-10 15:37:30 +01:00
Karel Zak e865838d6d libsmartcols: use libscols_cell for title 
References: https://github.com/karelzak/util-linux/issues/270
Signed-off-by: Karel Zak <kzak@redhat.com>
 2016-02-09 11:21:21 +01:00
Karel Zak e85c8c98e6 libsmartcols: make SCOLS_FL_WRAP usable in tree 
Signed-off-by: Karel Zak <kzak@redhat.com>
 2016-01-25 15:31:24 +01:00
Karel Zak e90f4b6715 libsmartcols: add wrap.c sample 
Signed-off-by: Karel Zak <kzak@redhat.com>
 2016-01-25 15:17:21 +01:00
Karel Zak 4a51e682bb libsmartcols: fix title sample 
Signed-off-by: Karel Zak <kzak@redhat.com>
 2016-01-25 13:45:34 +01:00
Karel Zak 107ca34a4c libsmartcols: fix samples build, add title.c 
Signed-off-by: Karel Zak <kzak@redhat.com>
 2016-01-25 13:42:51 +01:00
Karel Zak 2f09ae9d5d libsmartcols: add samples directory 
Signed-off-by: Karel Zak <kzak@redhat.com>
 2016-01-25 13:17:43 +01:00