debian/changelog; Update for new upstream release

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>

.gitignore

@@ -6,6 +6,10 @@
 *.a
 .deps
 .libs
+ID
+GPATH
+GRTAGS
+GTAGS
 tmp/
 compile
 config.*
@@ -22,3 +26,4 @@ aclocal.m4
 ar-lib
 autom4te.cache
 libite*
+test-driver

ChangeLog.md

@@ -4,6 +4,91 @@ Change Log
 All notable changes to the project are documented in this file.
 
 
+[v2.0.1][] - 2017-12-22
+-----------------------
+
+### Changes
+- Add missing `initscr()` declaration, regression in [v2.0.0][]
+- Add `#ifdef` guards around `min()` and `max()` macros
+- Add `const` to `char *` args in multiple API:s:
+  - `fexist()`
+  - `fgetint()`
+  - `fisslashdir()`
+  - `copyfile()`
+  - `movefile()`
+  - `ifconfig()`
+  - `lfopen()`
+  - `lfgetkey()`
+  - `lfgetint()`
+
+### Fixes
+- Fix #9, uncommon location of `which` command in unit test
+- Fix #10, supply unit test with a default `$PATH`
+- Fix #11, `touch()` command cannot handle relative paths when updating
+  the mtime of an existing file
+
+
+[v2.0.0][] - 2017-11-22
+-----------------------
+
+### Changes
+- Remove `tree()`, moved to toolbox.git instead
+- Remove `fmode()`, please use `stat()` instead, it's safer
+- Add support for keeping mtime in `copy()` and `rsync()`
+- Move source files to an `src/` sub-directory
+- Move `initscr()` from `conio.h` to `conio.c`
+- Update docs, recommend `mkpath()` over `makepath()`
+- Bump ABI version, major changes to library
+
+### Fixes
+- Fix #7, inconsistent return value in `mkpath()` and `makepath()`
+- Fix #8, constify `mkpath()` and `makepath()`
+
+
+[v1.9.3][] - 2017-10-24
+-----------------------
+
+### Changes
+- `initscr()`, use stdout, not stderr, like the rest of the
+  `conio.h` macros.  Also, stderr may be redirected by user
+- `tree()`, update unit test, use standard directries
+
+### Fixes
+- `initscr()`, verify that both stdin and stdout are real TTYs
+  before messing up output or blocking on input for the user
+- `tree()`, increase internal buffer slightly, output may be
+  truncated otherwise.  Found by GCC 7.2
+
+
+[v1.9.2][] - 2017-07-09
+-----------------------
+
+### Changes
+- Add `initscr()` function to query screen size
+- Convert `printheader()` to a static inline function
+
+
+[v1.9.1][] - 2017-07-03
+-----------------------
+
+### Changes
+- Add missing `whichp()` predicate function to accompany `which()`
+- Allow `which("ps aux")`, which skips any arguments to command
+
+
+[v1.9.0][] - 2017-07-02
+-----------------------
+
+### Changes
+- Add `which()`, a C implementation of UNIX which(1)
+- Add `printheader()`, prints a top-like table heading for client tools
+- Remove `UNUSED()` macro, recommended to disable GCC warning instead
+
+### Fixes
+- Fix issue #6: `touch()` does not update mtime if file exists
+- Fix non-writable `tempfile()`, now with proper unit test
+
+
 [v1.8.3][] - 2017-01-08
 -----------------------
 
@@ -231,7 +316,13 @@ problems this may cause!
 Initial extraction of frog DNA from [Finit][].  See [README][] for API details.
 
 
-[UNRELEASED]: https://github.com/troglobit/libite/compare/v1.8.3...HEAD
+[UNRELEASED]: https://github.com/troglobit/libite/compare/v2.0.1...HEAD
+[v2.0.1]: https://github.com/troglobit/libite/compare/v2.0.0...v2.0.1
+[v2.0.0]: https://github.com/troglobit/libite/compare/v1.9.3...v2.0.0
+[v1.9.3]: https://github.com/troglobit/libite/compare/v1.9.2...v1.9.3
+[v1.9.2]: https://github.com/troglobit/libite/compare/v1.9.1...v1.9.2
+[v1.9.1]: https://github.com/troglobit/libite/compare/v1.9.0...v1.9.1
+[v1.9.0]: https://github.com/troglobit/libite/compare/v1.8.3...v1.9.0
 [v1.8.3]: https://github.com/troglobit/libite/compare/v1.8.2...v1.8.3
 [v1.8.2]: https://github.com/troglobit/libite/compare/v1.8.1...v1.8.2
 [v1.8.1]: https://github.com/troglobit/libite/compare/v1.8.0...v1.8.1
@@ -254,9 +345,3 @@ Initial extraction of frog DNA from [Finit][].  See [README][] for API details.
 [Inadyn]: https://github.com/troglobit/inadyn/
 [Mg]:     https://github.com/troglobit/mg
 [README]: https://github.com/troglobit/libite/blob/v1.0.0/README.md
-
-<!--
-  -- Local Variables:
-  -- mode: markdown
-  -- End:
-  -->

HACKING.md

@@ -4,9 +4,10 @@ Maintenance and Release Checklist
 Maintenance
 -----------
 
+* Encourage contributors to write tests, in particular for new features
+* Run tests regularly, use Travis-CI to do this automatically
 * Leverage GitHub issues for milestone planning
 * Reference issues from GitHub pull requests to alert issue subscribers
-* Encourage contributors to write unit tests
 * Bump library ABI version just before release!
 
 
@@ -17,6 +18,7 @@ Release Checklist
   - Inform users in a plain language of changes and bug fixes
   - Do *not* copy-paste GIT commit logs!
   - Order entrys according to importance, most relevant first
+* Run unit tests: `make check`
 * Do we need to bump the ABI version? (Probably, see below)
 * Tag
 * Push last commit(s) *and* tags to GitHub
@@ -25,7 +27,7 @@ Release Checklist
         make distclean
         ./autogen.sh
         ./configure
-		make release
+        make release
 
 * Create new release in GitHub releases page
 * Copy and paste ChangeLog entry, check any stale links!
@@ -54,14 +56,31 @@ It must be updated according to the [GNU Libtool recommendations][1]:
    release of your software.  More frequent updates are unnecessary, and
    only guarantee that the current interface number gets larger faster.
 3. If the library *source code has changed at all* since the last update,
-   then increment revision (`c:r:a` --> `c:r+1:a`)
-4. If any *interfaces have been added, removed, or changed* since last
-   update, increment current, and zero revision (`c:r:a` --> `c+1:0:0`)
+   then increment revision (`c:r:a` becomes `c:r+1:a`).
+4. If any *interfaces have been added, removed, or changed* since the
+   last update, increment current, and set revision to 0.
 5. If any *interfaces have been added* since the last public release,
    then increment age.
 6. If any *interfaces have been removed or changed* since the last
    public release, then set age to 0.
 
+The libtool ABI versioning logic is very confusing but works if you just
+disable your brain and follow the rules, one by one.
+
+**Example #1:** a new function has been added, none of the existing ones
+have changed.  The initial version is 1:0:0, we follow the rules above to
+the letter: increase revision, increase current and set revision to zero,
+and finally increase age.  This, rather confusingly, gives us 2:0:1 which
+libtool then translates to `libconfuse.so.1.1.0`.
+
+**Example #2:** some existing functions are changed, they now return an
+`int` instead of `void`.  The initial version is 0:0:0, and we follow the
+rules again: increment revision, increment current and set revision to
+zero, set age to zero.  This gives us 1:0:0, which is then translated to
+ `libconfuse.so.1.0.0`.
+
+### Note
+
 Usually, non-developers have no interest in running development versions
 (releases are frequent enough), and developers are expected to know how
 to juggle versions.  In such an ideal world, it is good enough to bump

Makefile.am

@@ -1,22 +1,14 @@
 ACLOCAL_AMFLAGS     = -I m4
 
-lib_LTLIBRARIES     = libite.la
-pkgincludedir       = $(includedir)/lite
-pkginclude_HEADERS  = lite.h queue.h conio.h tree.h strlite.h strdupa.h strndupa.h strnlen.h
-libite_la_SOURCES   = chomp.c copyfile.c dir.c fexist.c fisdir.c fmode.c fparseln.c		\
-		      fsendfile.c ifconfig.c lfile.c makepath.c pidfile.c pidfilefn.c		\
-		      progress.c reallocarray.c rsync.c strlcpy.c strlcat.c strtonum.c		\
-		      tempfile.c tree.c
-
-libite_la_CPPFLAGS  = -D_GNU_SOURCE
-libite_la_CFLAGS    = -W -Wall -Wextra
-libite_la_LDFLAGS   = $(AM_LDFLAGS) -version-info 3:1:0
-
-pkgconfigdir        = $(libdir)/pkgconfig
-pkgconfig_DATA      = libite.pc
 doc_DATA            = README.md LICENSE
 EXTRA_DIST          = README.md LICENSE ChangeLog.md
-SUBDIRS             = tests
+pkgconfigdir        = $(libdir)/pkgconfig
+pkgconfig_DATA      = libite.pc
+SUBDIRS             = src tests
+
+## Generate .deb package
+package:
+	@dpkg-buildpackage -uc -us -B
 
 ## Generate MD5 checksum file
 MD5 = md5sum
@@ -44,7 +36,7 @@ release-hook:
 	fi
 
 ## Target to run when building a release
-release: dist release-hook md5-dist
+release: distcheck release-hook md5-dist
 	@for file in $(DIST_ARCHIVES); do							\
 		printf "$$file    \tDistribution tarball\n";					\
 		printf "$$file.md5\t"; cat $$file.md5 | cut -f1 -d' ';				\

README.md

@@ -15,27 +15,24 @@ Table of Contents
 * [TODO](#todo)
 
 
+> **NOTE:** Incompatible changes in v2.0 compared to v1.x!
+
 Introduction
 ------------
 
-Libite is a lightweight library of *frog DNA*.  It can be used to fill
+Libite is a lightweight library of *frog DNA* that can be used to fill
 the gaps in any dinosaur project.  It holds useful functions and macros
 developed by both [Finit][1] and the [OpenBSD][2] project.  Most notably
 the string functions: [strlcpy(3)][3], [strlcat(3)][3] and the highly
 useful *BSD [sys/queue.h][4] and [sys/tree.h][7] API's.
 
-Libite is the frog DNA missing in GNU libc.  However, -lite does not aim
-to become another [GLIB][5]!  One noticeable gap in GLIBC is the missing
-`_SAFE` macros in the BSD `sys/queue.h` API — highly recommended
-when traversing lists to delete/free nodes.
+Libite holds many of the missing pieces in GNU libc, although -lite does
+not aim to become another [GLIB][5].  One noticeable gap in GLIBC is the
+`_SAFE` macros available in the BSD `sys/queue.h` API — highly
+recommended when traversing lists to delete/free nodes.
 
-The code is open sourced under a mix of the [MIT/X11 license][MIT], the
-[ISC license][ISC] used by OpenBSD, and [BSD licenses][BSD], all of them
-are extremely liberal and can be used freely in proprietary software if
-needed.
-
-For an introduction to why Libite happened, and how you can use it, see
-[this blog post][6].
+The code is open sourced under a mix of permissive Open Source licenses:
+[MIT/X11 license][MIT], [ISC license][ISC], and [BSD licenses][BSD].
 
 
 Using -lite
@@ -143,10 +140,6 @@ Helper Macros
   Returns the number of elements in an array.  From the great book, The
   Practice of Programming, by Kernighan and Pike.
 
-- `UNUSED(var)`
-
-  Shorter and more readable version of `var __attribute__ ((unused))`
-
 
 Generic Functions
 -----------------
@@ -155,9 +148,18 @@ Generic Functions
 
   Perl like chomp function, chop off last char if newline.
 
-- `copyfile(src, dst, len, symlink)`
+- `copyfile(src, dst, len, opt)`
 
-  Like the shell `cp(1)` and `dd(1),` can also create symlinks.
+  Like the shell `cp(1)` and `dd(1),`, can also copy symlinks and
+  preserve the mtime of the source file.  The opt argument can be
+  a mask of:
+  
+  - `LITE_FOPT_COPYFILE_SYM (0x01)`
+  - `LITE_FOPT_KEEP_MTIME   (0x02)`
+  
+  In releases prior to v2.0 the opt argument was called `symlink`.
+  The APIs are 100% compatible if the value `1` was used to enable
+  the symlink option.
 
 - `dir(dir, ext, filter, list, strip)`
 
@@ -179,10 +181,6 @@ Generic Functions
 
   Check for the existence of a directory, returns True(1) or False(0).
 
-- `fmode(file)`
-
-  Returns the `mode_t` bits of a file or directory.
-
 - `fsendfile(src, dst, len)`
 
   Copy data between file streams, very similar to `fcopyfile()`, but
@@ -272,10 +270,19 @@ Generic Functions
   Called multiple times with the same percentage value cause spinner to
   spin.
 
-- `rsync(src, dst, delete, *filter())`
+- `rsync(src, dst, opt, *filter())`
 
-  Very simple `rsync()` to copy files files and directories
-  recursively.
+  Very simple `rsync()` to copy files and directories recursively.  It
+  supports pruning files from the destination tree that do not exist in
+  the source tree and preserving the mtime of the source files.  The opt
+  argument can be a mask of:
+  
+  - `LITE_FOPT_RSYNC_DELETE (0x01)`
+  - `LITE_FOPT_KEEP_MTIME   (0x02)`
+  
+  In releases prior to v2.0 the argument controlling pruning was called
+  `delete`, it is now called `opt`.  The APIs are 100% compatible if the
+  value `1` was used.
 
 - `tempfile()`
 
@@ -286,11 +293,15 @@ Generic Functions
   **Note:** Requires Linux v3.11, or later, will fall back to the old
     and unsafe `tmpfile()` on older systems.
 
-- `tree(path, show_perms)`
+- `which(cmd)`, `whichp(cmd)`
 
-  Very simple `/bin/tree` replacement.  Draw ASCII tree of `path`, with
-  optional listing of file and directory permissions if `show_perms` is
-  set.  The `path` argument should be a directory.
+  C implementation of UNIX which(1).  Returns a malloc'ed string with the
+  full path to `cmd` on success, otherwise `NULL`.
+  
+  `whichp()` is a predicate function, returns `TRUE` or `FALSE`.
+
+  **Note:** `which("/bin/ps aux")` will return `/bin/ps`, or `TRUE`,
+  provided of course `/bin/ps` exists.
 
 
 GNU Functions
@@ -367,8 +378,6 @@ Build & Install
 
 This library was initially built for and developed on GNU/Linux systems
 as a light weight utility library, these days NetBSD should also work.
-Libite (LITE) employs the de facto standard GNU configure and build
-system:
 
     ./configure
     make -j5
@@ -380,27 +389,14 @@ generate a `configure` script.  It is a generated file and otherwise only
 included in released tarballs.
 
 
-TODO
-----
-
-- Improve documentation, possibly use kdoc or gdoc2 to generate docs from API.
-- Continuously, update OpenBSD functions/macros.
-
 [1]: https://github.com/troglobit/finit
 [2]: http://www.openbsd.org/
 [3]: http://www.openbsd.org/cgi-bin/man.cgi?query=strlcpy
 [4]: http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man3/LIST_EMPTY.3
 [5]: https://developer.gnome.org/glib/
-[6]: http://troglobit.com/blog/2015/07/02/howto-using-lite-with-a-git-based-application/
 [7]: http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man3/SPLAY_FOREACH.3
 [MIT]: https://en.wikipedia.org/wiki/MIT_License
 [ISC]: https://en.wikipedia.org/wiki/ISC_license
 [BSD]: https://en.wikipedia.org/wiki/BSD_licenses
 [Travis]: https://travis-ci.org/troglobit/libite
 [Travis Status]: https://travis-ci.org/troglobit/libite.png?branch=master
-
-<!--
-  -- Local Variables:
-  -- mode: markdown
-  -- End:
-  -->

TODO.md

@@ -1,7 +1,8 @@
 TODO ... in no particular order
 ===============================
 
+* Improve documentation, possibly use kdoc or gdoc2 to generate docs from API
+* Continuously, update OpenBSD functions/macros
 * Investigate adding FreeBSD pidfile_open() et al
 * Investigate FreeBSD libutil library, could be useful for porting between unices
 
-

configure.ac

@@ -1,10 +1,10 @@
-AC_INIT(libite, 1.8.3, https://github.com/troglobit/libite/issues)
+AC_INIT(libite, 2.0.1, https://github.com/troglobit/libite/issues)
 AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz])
 AM_SILENT_RULES([yes])
 
-AC_CONFIG_SRCDIR(lite.h)
+AC_CONFIG_SRCDIR(src/lite.h)
 AM_CONFIG_HEADER(config.h)
-AC_CONFIG_FILES([Makefile tests/Makefile libite.pc])
+AC_CONFIG_FILES([Makefile src/Makefile tests/Makefile libite.pc])
 AC_CONFIG_MACRO_DIR([m4])
 
 AC_PROG_CC

debian/changelog

@@ -1,3 +1,54 @@
+libite (2.0.1-1) unstable; urgency=medium
+
+  * New upstream release, v2.0.1, fixes to:
+    - touch(), cannot handle relative paths when updating mtime
+    - unit test for which()
+    - add missing initscr() declaration in conio.h
+    - ifdef guards around min()/max() macros
+ -- Joachim Nilsson <troglobit@gmail.com>  Fri, 22 Dec 2017 12:11:41 +0100
+
+libite (2.0.0-1) unstable; urgency=low
+
+  * New upstream release, v2.0.0, fixes to:
+    - makepath(), mkpath()
+  * Changes to
+    - rsync(), API changes
+    - copyfile(), API changes
+    - tree(), removed from library
+    - fmode(), removed from library
+
+ -- Joachim Nilsson <troglobit@gmail.com>  Sun, 19 Nov 2017 22:42:51 +0100
+
+libite (1.9.3-1) unstable; urgency=low
+
+  * New upstream release, v1.9.3, fixes to conio.h, initscr() and tree().
+
+ -- Joachim Nilsson <troglobit@gmail.com>  Tue, 24 Oct 2017 08:49:54 +0200
+
+libite (1.9.2-1) unstable; urgency=low
+
+  * New upstream reelase, v1.9.2, see upstream ChangeLog for details.
+
+ -- Joachim Nilsson <troglobit@gmail.com>  Tue, 15 Aug 2017 08:15:14 +0200
+
+libite (1.9.1-1) unstable; urgency=low
+
+  * New upstream reelase, v1.9.1.
+
+ -- Joachim Nilsson <troglobit@gmail.com>  Sun, 02 Jul 2017 19:23:00 +0100
+
+libite (1.9.0-1) unstable; urgency=low
+
+  * New upstream reelase.
+
+ -- Joachim Nilsson <troglobit@gmail.com>  Sun, 02 Jul 2017 19:23:00 +0100
+
+libite (1.8.3-1) unstable; urgency=low
+
+  * New upstream reelase.
+
+ -- Joachim Nilsson <troglobit@gmail.com>  Sun, 08 Jan 2017 15:22:26 +0100
+
 libite (1.8.2-1) unstable; urgency=low
 
   * Initial release.

fmode.c

@@ -1,56 +0,0 @@
-/* File mode bit operations
- *
- * Copyright (c) 2008 Claudio Matsuoka <http://helllabs.org/finit/>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
-/**
- * fmode - Return a file's mode bits.
- * @file: File to look for, with full path.
- *
- * Returns:
- * The mode bits or zero when @file does not exist and errno set to %ENOENT.
- */
-mode_t fmode(char *file)
-{
-	struct stat sb;
-
-	if (!file) {
-		errno = EINVAL;
-		return 0;
-	}
-
-	if (!stat(file, &sb))
-		return sb.st_mode;
-
-	return 0;
-}
-
-/**
- * Local Variables:
- *  indent-tabs-mode: t
- *  c-file-style: "linux"
- * End:
- */

src/Makefile.am

@@ -0,0 +1,24 @@
+lib_LTLIBRARIES       = libite.la
+
+libite_la_CPPFLAGS    = -D_GNU_SOURCE
+libite_la_CFLAGS      = -W -Wall -Wextra
+libite_la_LDFLAGS     = $(AM_LDFLAGS) -version-info 5:1:0
+libite_la_SOURCES     = chomp.c		copyfile.c			\
+			conio.c		conio.h				\
+			dir.c						\
+			fexist.c	fisdir.c			\
+			fparseln.c	fsendfile.c			\
+			ifconfig.c	lfile.c				\
+			makepath.c	progress.c			\
+			pidfile.c	pidfilefn.c			\
+			reallocarray.c	rsync.c				\
+			strlcpy.c 	strlcat.c 	strtonum.c	\
+			strdupa.h	strndupa.h	strnlen.h	\
+			tempfile.c	which.c				\
+			lite.h		strlite.h			\
+			queue.h		tree.h
+
+
+## Distribute these header files in the <lite/...> name space
+pkgincludedir       = $(includedir)/lite
+pkginclude_HEADERS  = lite.h queue.h conio.h tree.h strlite.h strdupa.h strndupa.h strnlen.h

src/conio.c

@@ -0,0 +1,83 @@
+/* A conio.h like implementation for VTANSI displays.
+ *
+ * Copyright (c) 2009-2017  Joachim Nilsson <troglobit@gmail.com>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <poll.h>
+#include <stdio.h>
+#include <termios.h>
+#include <unistd.h>
+
+void initscr(int *row, int *col)
+{
+	if (!row || !col)
+		return;
+
+#if defined(TCSANOW) && defined(POLLIN)
+	struct termios tc, saved;
+	struct pollfd fd = { STDIN_FILENO, POLLIN, 0 };
+
+	if (!isatty(STDIN_FILENO) || !isatty(STDOUT_FILENO)) {
+		*row = 24;
+		*col = 80;
+		return;
+	}
+
+	/* Disable echo to terminal while probing */
+	tcgetattr(STDOUT_FILENO, &tc);
+	saved = tc;
+	tc.c_cflag |= (CLOCAL | CREAD);
+	tc.c_lflag &= ~(ICANON | ECHO | ECHOE | ISIG);
+	tcsetattr(STDOUT_FILENO, TCSANOW, &tc);
+
+	/*
+	 * Save cursor pos+attr
+	 * Diable top+bottom margins
+	 * Set cursor at the far bottom,right pos
+	 * Query term for resulting pos
+	 */
+	fprintf(stdout, "\e7" "\e[r" "\e[999;999H" "\e[6n");
+	fflush(stdout);
+
+	/*
+	 * Wait here for terminal to echo back \e[row,lineR ...
+	 */
+	if (poll(&fd, 1, 300) <= 0 || scanf("\e[%d;%dR", row, col) != 2) {
+		*row = 24;
+		*col = 80;
+	}
+
+	/*
+	 * Restore above saved cursor pos+attr
+	 */
+	fprintf(stdout, "\e8");
+	fflush(stdout);
+
+	/* Restore terminal */
+	tcsetattr(STDOUT_FILENO, TCSANOW, &saved);
+
+	return;
+#else
+	*row = 24;
+	*col = 80;
+#endif
+}
+
+/**
+ * Local Variables:
+ *  indent-tabs-mode: t
+ *  c-file-style: "linux"
+ * End:
+ */

src/conio.h

@@ -1,6 +1,6 @@
 /* A conio.h like implementation for VTANSI displays.
  *
- * Copyright (c) 2009-2013  Joachim Nilsson <troglobit@gmail.com>
+ * Copyright (c) 2009-2017  Joachim Nilsson <troglobit@gmail.com>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -48,29 +48,44 @@
 #define LIGHTCYAN    0x16
 #define WHITE        0x17
 
-/* Esc[2JEsc[1;1H             - Clear screen and move cursor to 1,1 (upper left) pos. */
-#define clrscr()              fputs ("\033[2J\033[1;1H", stdout)
-/* Esc[K                      - Erases from the current cursor position to the end of the current line. */
-#define clreol()              fputs ("\033[K", stdout)
-/* Esc[2K                     - Erases the entire current line. */
-#define delline()             fputs ("\033[2K", stdout)
-/* Esc[Line;ColumnH           - Moves the cursor to the specified position (coordinates) */
-#define gotoxy(x,y)           printf("\033[%d;%dH", y, x)
-/* Esc[?25l (lower case L)    - Hide Cursor */
-#define hidecursor()          fputs ("\033[?25l", stdout)
-/* Esc[?25h (lower case H)    - Show Cursor */
-#define showcursor()          fputs ("\033[?25h", stdout)
+#ifndef SCREEN_WIDTH
+#define SCREEN_WIDTH 80		/* Override using, e.g. #define SCREEN_WIDTH tty_width() */
+#endif
 
-/* Esc[Value;...;Valuem       - Set Graphics Mode */
-#define __set_gm(attr,color,val)					\
-	if (!color)							\
-		printf("\033[%dm", attr);					\
+/* Esc[2JEsc[1;1H             - Clear screen and move cursor to 1,1 (upper left) pos. */
+#define clrscr()              fputs("\033[2J\033[1;1H", stdout)
+/* Esc[K                      - Erases from the current cursor position to the end of the current line. */
+#define clreol()              fputs("\033[K", stdout)
+/* Esc[2K                     - Erases the entire current line. */
+#define delline()             fputs("\033[2K", stdout)
+/* Esc[Line;ColumnH           - Moves the cursor to the specified position (coordinates) */
+#define gotoxy(x,y)           fprintf(stdout, "\033[%d;%dH", y, x)
+/* Esc[?25l (lower case L)    - Hide Cursor */
+#define hidecursor()          fputs("\033[?25l", stdout)
+/* Esc[?25h (lower case H)    - Show Cursor */
+#define showcursor()          fputs("\033[?25h", stdout)
+
+/* Esc[Value;...;Valuem       - Set Graphics Mode (attr, color, val) */
+#define __set_gm(a,c,v)							\
+	if (!c)								\
+		fprintf(stdout, "\033[%dm", a);				\
 	else								\
-		printf("\033[%d;%dm", color & 0x10 ? 1 : 0, (color & 0xF) + val)
+		fprintf(stdout, "\033[%d;%dm", c & 0x10 ? 1 : 0, (c & 0xF) + v)
 #define textattr(attr)        __set_gm(attr, 0, 0)
 #define textcolor(color)      __set_gm(RESETATTR, color, 30)
 #define textbackground(color) __set_gm(RESETATTR, color, 40)
 
+void initscr(int *row, int *col);
+
+/* Print table heading @line to @fp, with optional leading newline */
+static inline void printheader(FILE *fp, const char *line, int nl)
+{
+	fprintf(fp ?: stdout,
+		"%s\033[7m%s%*s\033[0m\n",
+		nl ? "\n" : "",
+		line, SCREEN_WIDTH - (int)strlen(line), "");
+}
+
 #endif /* CONIO_H_ */
 
 /**

src/copyfile.c

@@ -27,7 +27,7 @@
 #include "lite.h"
 
 /* Tests if dst is a directory, if so, reallocates dst and appends src filename returning 1 */
-static int adjust_target(char *src, char **dst)
+static int adjust_target(const char *src, char **dst)
 {
 	int isdir = 0;
 
@@ -36,7 +36,7 @@ static int adjust_target(char *src, char **dst)
 		char *tmp, *ptr = strrchr(src, '/');
 
 		if (!ptr)
-			ptr = src;
+			ptr = (char *)src;
 		else
 			ptr++;
 
@@ -80,26 +80,46 @@ static ssize_t do_copy(int in, int out, size_t num, char *buffer, size_t len)
 	return size;
 }
 
+static void set_mtime(int in, int out)
+{
+	struct stat st;
+	struct timespec tv[2];
+
+	fstat(in, &st);
+	tv[0] = st.st_atim;
+	tv[1] = st.st_mtim;
+	futimens(out, tv);
+}
+
 /**
  * copyfile - Copy a file to another.
  * @src: Full path name to source file.
  * @dst: Full path name to target file.
  * @len: Number of bytes to copy, zero (0) for entire file.
- * @sym: Should symlinks be recreated (1) or followed (0)
+ * @opt: An option mask of %LITE_FOPT_COPYFILE_SYM, %LITE_FOPT_KEEP_MTIME
  *
  * This is a C implementation of the command line cp(1) utility.  It is one
  * of the classic missing links in the UNIX C library.  This version is from
  * the finit project, http://helllabs.org/finit/, which is a reimplementation
  * of fastinit for the Asus EeePC.
  *
+ * The @opt field replaces the @sym argument in previous releases and
+ * works as follows.  To maintain backwards compatibility with @sym
+ * the %LITE_FOPT_COPYFILE_SYM maintains a value of 1:
+ *
+ * %LITE_FOPT_COPYFILE_SYM: Recreate symlink or follow to copy target
+ * %LITE_FOPT_KEEP_MTIME:   Preserve modification time
+ *
  * Returns:
  * The number of bytes copied, zero may be error (check errno!), but it
  * may also indicate that @src was empty.  If @src is a directory @errno
  * will be set to %EISDIR since copyfile() is not recursive.
  */
-ssize_t copyfile(char *src, char *dst, int len, int sym)
+ssize_t copyfile(const char *src, const char *dst, int len, int opt)
 {
-	char *buffer;
+	char *buffer, *dest = (char *)dst;
+	int sym = (opt & LITE_FOPT_COPYFILE_SYM) != 0;
+	int keep_mtim = (opt & LITE_FOPT_KEEP_MTIME) != 0;
 	int in, out, isdir = 0, saved_errno = 0;
 	size_t num;
 	ssize_t size = 0;
@@ -117,7 +137,7 @@ ssize_t copyfile(char *src, char *dst, int len, int sym)
 	}
 
 	/* Check if target is a directory, then append src filename. */
-	isdir = adjust_target(src, &dst);
+	isdir = adjust_target(src, &dest);
 
 	/* Check if the source file is a symlink ... */
 	if (stat(src, &st)) {
@@ -134,7 +154,7 @@ ssize_t copyfile(char *src, char *dst, int len, int sym)
 				size = -1;
 			} else {
 				buffer[size] = 0;
-				size = !symlink(buffer, dst);
+				size = !symlink(buffer, dest);
 			}
 		}
 
@@ -155,7 +175,7 @@ ssize_t copyfile(char *src, char *dst, int len, int sym)
 		goto exit;
 	}
 
-	out = open(dst, O_WRONLY | O_CREAT | O_TRUNC, fmode(src));
+	out = open(dest, O_WRONLY | O_CREAT | O_TRUNC, st.st_mode);
 	if (out < 0) {
 		close(in);
 		saved_errno = errno;
@@ -165,6 +185,8 @@ ssize_t copyfile(char *src, char *dst, int len, int sym)
 	size = do_copy(in, out, num, buffer, BUFSIZ);
 	if (!size && errno)
 		saved_errno = errno;
+	else if (keep_mtim)
+		set_mtime(in, out);
 
 	close(out);
 	close(in);
@@ -172,7 +194,7 @@ ssize_t copyfile(char *src, char *dst, int len, int sym)
 exit:
 	free(buffer);
 	if (isdir)
-		free(dst);
+		free(dest);
 	errno = saved_errno;
 
 	return size;
@@ -194,17 +216,18 @@ exit:
  * Returns:
  * POSIX OK(0), or non-zero with errno set.
  */
-int movefile(char *src, char *dst)
+int movefile(const char *src, const char *dst)
 {
+	char *dest = (char *)dst;
 	int isdir, result = 0;
 
 	/* Check if target is a directory, then append the src base filename. */
-	isdir = adjust_target(src, &dst);
+	isdir = adjust_target(src, &dest);
 
-	if (rename(src, dst)) {
+	if (rename(src, dest)) {
 		if (errno == EXDEV) {
 			errno = 0;
-			copyfile(src, dst, 0, 1);
+			copyfile(src, dest, 0, 1);
 			if (errno)
 				result = 1;
 			else
@@ -215,7 +238,7 @@ int movefile(char *src, char *dst)
 	}
 
 	if (isdir)
-		free(dst);
+		free(dest);
 
 	return result;
 }

src/fexist.c

@@ -31,7 +31,7 @@
  * Returns:
  * %TRUE(1) if the file exists, otherwise %FALSE(0).
  */
-int fexist(char *file)
+int fexist(const char *file)
 {
 	if (!file) {
 		errno = EINVAL;

src/ifconfig.c

@@ -43,7 +43,7 @@ extern size_t strlcpy(char *dst, const char *src, size_t siz);
  * Returns:
  * POSIX OK(0) on success, or non-zero on error.
  */
-int ifconfig(char *ifname, char *addr, char *mask, int up)
+int ifconfig(const char *ifname, const char *addr, const char *mask, int up)
 {
 	int sd, ret = -1;
 	struct ifreq ifr;

src/lfile.c

@@ -24,7 +24,8 @@
 typedef struct lfile {
 	FILE *fp;
 	char buf[256];
-	char *sep, *save;
+	char *save;
+	const char *sep;
 } lfile_t;
 
 /**
@@ -35,7 +36,7 @@ typedef struct lfile {
  * Returns:
  * Pointer to a &lftile_t parser context, or %NULL on error.
  */
-lfile_t *lfopen(char *file, char *sep)
+lfile_t *lfopen(const char *file, const char *sep)
 {
 	lfile_t *lf;
 
@@ -92,23 +93,20 @@ char *lftok(lfile_t *lf)
 	}
 
 	token = strtok_r(NULL, lf->sep, &lf->save);
-	if (!token) {
-		while (fgets(lf->buf, sizeof(lf->buf), lf->fp)) {
-			if (lf->buf[0] == '#')
-				continue;
+	if (token)
+		return token;
 
-			token = strtok_r(lf->buf, lf->sep, &lf->save);
-			if (!token)
-				continue;
-			
+	while (fgets(lf->buf, sizeof(lf->buf), lf->fp)) {
+		if (lf->buf[0] == '#')
+			continue;
+
+		token = strtok_r(lf->buf, lf->sep, &lf->save);
+		if (token)
 			return token;
-		}
-
-		errno = ENOENT;
-		return NULL;
 	}
 
-	return token;
+	errno = ENOENT;
+	return NULL;
 }
 
 /**
@@ -125,7 +123,7 @@ char *lftok(lfile_t *lf)
  * Returns:
  * The value to @key, or %NULL if not found.
  */
-char *lfgetkey(lfile_t *lf, char *key)
+char *lfgetkey(lfile_t *lf, const char *key)
 {
 	char *token;
 
@@ -151,7 +149,7 @@ char *lfgetkey(lfile_t *lf, char *key)
  * Returns:
  * The positive integer value for @key, or -1 if not found.
  */
-int lfgetint(lfile_t *lf, char *key)
+int lfgetint(lfile_t *lf, const char *key)
 {
 	char *token = lfgetkey(lf, key);
 
@@ -173,7 +171,7 @@ int lfgetint(lfile_t *lf, char *key)
  * Returns:
  * The positive integer value for @key, or -1 if not found.
  */
-int fgetint(char *file, char *sep, char *key)
+int fgetint(const char *file, const char *sep, const char *key)
 {
 	int val = -1;
 	lfile_t *lf;

src/lite.h

@@ -26,6 +26,7 @@
 #define LITE_H_
 
 #include <errno.h>
+#include <fcntl.h>     /* Definition of AT_* constants for utimensat() */
 #include <stdio.h>
 #include <stdint.h>    /* uint8_t, uint16_t, uint32_t, INT32_MAX, etc. */
 #include <sys/stat.h>
@@ -43,35 +44,41 @@
 #define FPARSELN_UNESCREST	0x08
 #define FPARSELN_UNESCALL	0x0f
 
+/*
+ * copyfile() and rsync() option flags
+ */
+#define LITE_FOPT_RSYNC_DELETE  0x01
+#define LITE_FOPT_COPYFILE_SYM  0x01
+#define LITE_FOPT_KEEP_MTIME    0x02
+
 typedef struct lfile lfile_t;
 
 char   *chomp      (char *str);
 char   *fparseln   (FILE *, size_t *, size_t *, const char[3], int);
 
-int     fexist     (char *file);
+int     fexist     (const char *file);
 int     fisdir     (const char *file);
-mode_t  fmode      (char *file);
 
 FILE   *tempfile   (void);
-ssize_t copyfile   (char *src, char *dst, int len, int sym);
-int     movefile   (char *src, char *dst);
+ssize_t copyfile   (const char *src, const char *dst, int len, int opt);
+int     movefile   (const char *src, const char *dst);
 int     fcopyfile  (FILE *src, FILE *dst);
 ssize_t fsendfile  (FILE *src, FILE *dst, size_t len);
 
-int     ifconfig   (char *ifname, char *addr, char *mask, int up);
+int     ifconfig   (const char *ifname, const char *addr, const char *mask, int up);
 
-lfile_t*lfopen     (char *file, char *sep);
+lfile_t*lfopen     (const char *file, const char *sep);
 void    lfclose    (lfile_t *lf);
 char   *lftok      (lfile_t *lf);
-char   *lfgetkey   (lfile_t *lf, char *key);
-int     lfgetint   (lfile_t *lf, char *key);
-int     fgetint    (char *file, char *sep, char *key);
+char   *lfgetkey   (lfile_t *lf, const char *key);
+int     lfgetint   (lfile_t *lf, const char *key);
+int     fgetint    (const char *file, const char *sep, const char *key);
 
-int     mkpath     (char *dir, mode_t mode);
-int     makepath   (char *dir);
+int     mkpath     (const char *dir, mode_t mode);
+int     makepath   (const char *dir);
 
 int     dir        (const char *dir, const char *type, int (*filter) (const char *file), char ***list, int strip);
-int     rsync      (char *src, char *dst, int delete,  int (*filter) (const char *file));
+int     rsync      (char *src, char *dst, int opt,  int (*filter) (const char *file));
 
 int     pidfile       (const char *basename);
 int     pidfile_signal(const char *pidfile, int signal);
@@ -80,16 +87,22 @@ pid_t   pidfile_poll  (const char *pidfile);
 
 void   *reallocarray(void *optr, size_t nmemb, size_t size);
 
-int     tree(char *path, int show_perms);
-
 void    progress       (int percent, int max_width);
 void    progress_simple(int percent);
 
+char   *which      (const char *cmd);
+int     whichp     (const char *cmd);
+
 #ifndef touch
+#include <sys/stat.h>		/* utimensat() */
+#include <sys/time.h>		/* utimensat() on *BSD */
 static inline int touch(const char *path)
 {
-	if (mknod((path), S_IFREG|0644, 0) && errno != EEXIST)
+	if (mknod((path), S_IFREG|0644, 0)) {
+		if (errno == EEXIST)
+			return utimensat(AT_FDCWD, path, NULL, 0);
 		return -1;
+	}
 	return 0;
 }
 #endif
@@ -151,13 +164,8 @@ static inline int erase(const char *path)
 #define NELEMS(array) (sizeof(array) / sizeof(array[0]))
 #endif
 
-/* Mark a function variable as unused, useful for generic callbacks */
-#ifndef UNUSED
-#define UNUSED(x) UNUSED_ ## x __attribute__ ((unused))
-#endif
-
 /* Does directory end with a slash? */
-static inline int fisslashdir(char *dir)
+static inline int fisslashdir(const char *dir)
 {
    if (!dir)
 	   return 0;
@@ -169,9 +177,9 @@ static inline int fisslashdir(char *dir)
 }
 
 /* Compat */
-#define copy_filep(src,dst)        fcopyfile(src,dst)
-#define pidfile_read_pid(file)     pifile_read(file)
-#define signal_pidfile(file,signo) pidfile_signal(file,signo)
+#define copy_filep(src, dst)        fcopyfile(src, dst)
+#define pidfile_read_pid(file)      pifile_read(file)
+#define signal_pidfile(file, signo) pidfile_signal(file, signo)
 
 #endif /* LITE_H_ */
 

src/makepath.c

@@ -29,13 +29,13 @@
  * Returns:
  * POSIX OK(0) on success, otherwise -1 with @errno set.
  */
-int mkpath(char *dir, mode_t mode)
+int mkpath(const char *dir, mode_t mode)
 {
 	struct stat sb;
 
 	if (!dir) {
 		errno = EINVAL;
-		return 1;
+		return -1;
 	}
 
 	if (!stat(dir, &sb))
@@ -50,13 +50,18 @@ int mkpath(char *dir, mode_t mode)
  * makepath - Create all components of the specified directory.
  * @dir: Directory to create.
  *
+ * Comment:
+ * It is recommended to use mkpath() over this function since it has
+ * the @mode argument while this function instead default ot 0777,
+ * which in most cases is insecure.
+ *
  * Returns:
  * POSIX OK (0) on success, otherwise -1 and errno set appropriately.
  * This function returns EINVAL on bad argument, or ENOMEM when it
  * fails allocating temporary memory.  For other error codes see the
  * mkdir() syscall description.
  */
-int makepath(char *dir)
+int makepath(const char *dir)
 {
 	return mkpath(dir, 0777);
 }

src/rsync.c

@@ -16,6 +16,7 @@
  */
 
 #include <errno.h>
+#include <fcntl.h>	/* AT_* macros */
 #include <stdlib.h>	/* NULL, free() */
 #include <string.h>	/* strlen() */
 #include <strings.h>	/* rindex() */
@@ -26,16 +27,17 @@
 
 #include "lite.h"
 
-static int copy(char *src, char *dst);
-static int mdir(char *buf, size_t buf_len, char *dir, char *name, mode_t mode);
+static int copy(char *src, char *dst, int opt);
+static int mdir(char *buf, size_t buf_len, char *dir, char *name, struct stat *st);
 static int prune(char *dst, char **new_files, int new_num);
+static int set_mtime(char *fn, struct stat *st);
 
 
 /**
  * rsync - Synchronize contents and optionally remove non-existing backups
  * @src: Source directory
  * @dst: Destination directory
- * @delete: Prune files from @dst that no longer exist in @src.
+ * @opt: An option mask of %LITE_FOPT_RSYNC_DELETE, %LITE_FOPT_KEEP_MTIME
  * @filter: Optional filtering function for source directory.
  *
  * This is a miniature implementation of the famous rsync for local use only.
@@ -44,19 +46,29 @@ static int prune(char *dst, char **new_files, int new_num);
  * files removed from src since last backup are pruned from the destination
  * (backup) directory.
  *
- * The filter callback, @filter, if provided, is used to determine what files to
- * include from the source directory when backing up.  If a file is to be skipped
- * the callback should simply return zero.
+ * The @opt parameter to rsync() is an option mask for the most common
+ * rsync(1) options.  Previously this argument was called @delete and
+ * to maintain backwards compatibility the value 1 is reserved:
+ *
+ * %LITE_FOPT_RSYNC_DELETE: Prune files from @dst that no longer exist in @src.
+ * %LITE_FOPT_KEEP_MTIME:   Preserve modification time
+ *
+ * The filter callback, @filter, if provided, is used to determine what
+ * files to include from the source directory when backing up.  If a
+ * file is to be skipped the callback should simply return zero.
  *
  * Returns:
  * POSIX OK(0), or non-zero with @errno set on error.
  */
-int rsync(char *src, char *dst, int delete, int (*filter) (const char *file))
+int rsync(char *src, char *dst, int opt, int (*filter)(const char *file))
 {
 	char source[256];
 	char dest[256];
-	int i = 0, num = 0, result = 0;
+	int delete = (opt & LITE_FOPT_RSYNC_DELETE) != 0;
+	int keep_mtim = (opt & LITE_FOPT_KEEP_MTIME);
+	int i = 0, num = 0, result = 0, do_mtim = 0;
 	char **files;		/* Array of file names. */
+	struct stat st;
 
 	if (!fisdir(dst))
 		makedir(dst, 0755);
@@ -65,7 +77,7 @@ int rsync(char *src, char *dst, int delete, int (*filter) (const char *file))
 		if (!fexist(src))
 			return 1;
 
-		if (copy(src, dst))
+		if (copy(src, dst, keep_mtim))
 			result++;
 
 		return errno;
@@ -80,9 +92,13 @@ int rsync(char *src, char *dst, int delete, int (*filter) (const char *file))
 		else
 			ptr++;
 
-		if (mdir(dest, sizeof(dest), dst, ptr, fmode(src)))
+		if (stat(src, &st))
+			return 1;
+
+		if (mdir(dest, sizeof(dest), dst, ptr, &st))
 			return 1;
 		dst = dest;
+		do_mtim = keep_mtim;
 	}
 
 	num = dir(src, "", filter, &files, 0);
@@ -91,21 +107,31 @@ int rsync(char *src, char *dst, int delete, int (*filter) (const char *file))
 		snprintf(source, sizeof(source), "%s%s%s", src, fisslashdir(src) ? "" : "/", files[i]);
 		if (fisdir(source)) {
 			char dst2[256];
+			struct stat st;
 
 			strcat(source, "/");
-			if (mdir (dst2, sizeof(dst2), dst, files[i], fmode(source))) {
+			if (stat(source, &st))
+				return 1;
+
+			if (mdir(dst2, sizeof(dst2), dst, files[i], &st)) {
 				result++;
 				continue;
 			}
 
-			rsync(source, dst2, delete, filter);
+			rsync(source, dst2, opt, filter);
+			if (keep_mtim)
+				set_mtime(dst2, &st);
+
 			continue;	/* Next file/dir in @src to copy... */
 		}
 
-		if (copy(source, dst))
+		if (copy(source, dst, keep_mtim))
 			result++;
 	}
 
+	if (do_mtim)
+		set_mtime(dest, &st);
+
 	/* We ignore any errors from the pruning, that phase albeit useful is only
 	 * cosmetic. --Jocke 2011-03-24 */
 	if (delete)
@@ -120,11 +146,9 @@ int rsync(char *src, char *dst, int delete, int (*filter) (const char *file))
 	return result;
 }
 
-static int copy(char *src, char *dst)
+static int copy(char *src, char *dst, int opt)
 {
-	errno = 0;
-
-	copyfile(src, dst, 0, 1);
+	copyfile(src, dst, 0, opt | LITE_FOPT_COPYFILE_SYM);
 	if (errno) {
 		if (errno != EEXIST)
 			return 1;
@@ -136,10 +160,10 @@ static int copy(char *src, char *dst)
 }
 
 /* Creates dir/name @mode ... skipping / if dir already ends so. */
-static int mdir(char *buf, size_t buf_len, char *dir, char *name, mode_t mode)
+static int mdir(char *buf, size_t buf_len, char *dir, char *name, struct stat *st)
 {
-	snprintf(buf, buf_len, "%s%s%s/", dir, fisslashdir(dir) ? "" : "/", name);
-	if (mkdir(buf, mode)) {
+	snprintf(buf, buf_len, "%s%s%s", dir, fisslashdir(dir) ? "" : "/", name);
+	if (mkdir(buf, st->st_mode)) {
 		if (EEXIST != errno)
 			return 1;
 
@@ -193,6 +217,16 @@ static int prune(char *dst, char **new_files, int new_num)
 	return result;
 }
 
+static int set_mtime(char *fn, struct stat *st)
+{
+	struct timespec tv[2];
+
+	tv[0] = st->st_atim;
+	tv[1] = st->st_mtim;
+
+	return utimensat(AT_FDCWD, fn, tv, AT_SYMLINK_NOFOLLOW);
+}
+
 /**
  * Local Variables:
  *  indent-tabs-mode: t

src/strlite.h

@@ -29,6 +29,23 @@
 #include "strndupa.h"
 #include "strnlen.h"
 
+#ifndef min
+#define min(a,b)				\
+	({					\
+		__typeof__ (a) _a = (a);	\
+		__typeof__ (b) _b = (b);	\
+		_a < _b ? _a : _b;		\
+	})
+#endif
+#ifndef max
+#define max(a,b)				\
+	({					\
+		__typeof__ (a) _a = (a);	\
+		__typeof__ (b) _b = (b);	\
+		_a > _b ? _a : _b;		\
+	})
+#endif
+
 #ifndef strlcpy
 size_t  strlcpy    (char *dst, const char *src, size_t siz);
 #endif
@@ -82,19 +99,4 @@ static inline int string_case_compare(const char *a, const char *b)
    return strlen (a) == strlen (b) && !strcasecmp (a, b);
 }
 
-#define min(a,b)				\
-	({					\
-		__typeof__ (a) _a = (a);	\
-		__typeof__ (b) _b = (b);	\
-		_a < _b ? _a : _b;		\
-	})
-
-#define max(a,b)				\
-	({					\
-		__typeof__ (a) _a = (a);	\
-		__typeof__ (b) _b = (b);	\
-		_a > _b ? _a : _b;		\
-	})
-
-
 #endif /* LITE_STRING_H_ */

src/tempfile.c

@@ -45,7 +45,7 @@ FILE *tempfile(void)
 	if (-1 == fd)
 		return NULL;
 
-	return fdopen(fd, "rw");
+	return fdopen(fd, "w+");
 #else
 	return tmpfile(); /* Fallback on older GLIBC/Linux and actual UNIX systems */
 #endif

src/which.c

@@ -0,0 +1,127 @@
+/* C implementation of UNIX which(1)
+ *
+ * Copyright (c) 2017  Joachim Nilsson <troglobit@gmail.com>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <ctype.h>
+#include <errno.h>
+#include <stdio.h>		/* snprintf() */
+#include <stdlib.h>		/* realloc(), free() */
+#include <string.h>		/* strtok_r() */
+#include <unistd.h>		/* access() */
+
+/* Strip any arguments in "/path/to/bin --some args", modifies input string */
+static char *strip_args(char *path)
+{
+	size_t i = 0;
+
+	if (!path)
+		return NULL;
+
+	/* Find first whitespace (space/tab/etc.) */
+	while (path[i] && !isspace(path[i]))
+		i++;
+	path[i] = 0;
+
+	return path;
+}
+
+/*
+ * Like which(1), returns a malloc'ed path to cmd on success, or NULL
+ */
+char *which(const char *cmd)
+{
+	size_t pathlen = 0;
+	char *ptr, *tok, *env, *path = NULL;
+
+	if (!cmd) {
+		errno = EINVAL;
+		return NULL;
+	}
+
+	if (cmd[0] == '/') {
+		path = strip_args(strdup(cmd));
+		if (!path)
+			return NULL;
+
+		if (!access(path, X_OK))
+			return path;
+
+		if (path)
+			free(path);
+
+		return NULL;
+	}
+
+	ptr = getenv("PATH");
+	if (!ptr)
+		return NULL;
+
+	env = strdup(ptr);
+	if (!env)
+		return NULL;
+
+	tok = strtok_r(env, ":", &ptr);
+	while (tok) {
+		size_t len = strlen(tok) + strlen(cmd) + 2;
+
+		if (pathlen < len) {
+			path = realloc(path, len);
+			if (!path) {
+				free(env);
+				return NULL;
+			}
+			pathlen = len;
+		}
+
+		snprintf(path, pathlen, "%s/%s", tok, cmd);
+		path = strip_args(path);
+		if (!path || !access(path, X_OK)) {
+			free(env);
+			return path;
+		}
+
+		tok = strtok_r(NULL, ":", &ptr);
+	}
+
+	if (path)
+		free(path);
+	free(env);
+
+	return NULL;
+}
+
+/*
+ * Like which(), above, but only answers TRUE(1)/FALSE(0)
+ */
+int whichp(const char *cmd)
+{
+	char *path;
+
+	path = which(cmd);
+	if (path) {
+		free(path);
+		return 1;
+	}
+
+	return 0;
+}
+
+/**
+ * Local Variables:
+ *  indent-tabs-mode: t
+ *  c-file-style: "linux"
+ * End:
+ */

tests/.gitignore

@@ -12,4 +12,6 @@ pidfile
 progress
 rsync
 tempfile
+touch
 tree
+which

tests/Makefile.am

@@ -11,14 +11,16 @@ TESTS          += fsendfile
 TESTS          += lfile
 TESTS          += makepath
 TESTS          += pidfile
+TESTS          += touch
 TESTS          += progress
 TESTS          += rsync
 TESTS          += tempfile
-TESTS          += tree
+TESTS          += which
 
 check_PROGRAMS  = $(TESTS)
 
 # Ignore warnings about unused result, in e.g. write()
-CPPFLAGS        = -D_GNU_SOURCE
-LDADD           = -L../ ../libite.la
-LDFLAGS         = -static
+CFLAGS         += -Wno-unused-result
+CPPFLAGS       += -D_GNU_SOURCE
+LDADD           = -L../src/ ../src/libite.la
+LDFLAGS        += -static

tests/check.h

@@ -6,7 +6,10 @@
 #include <string.h>
 #include <time.h>
 
-#include "../lite.h"
+#include "../src/conio.h"
+#include "../src/lite.h"
+
+#define PRINT(args...) if (verbose) printf(args)
 
 #define fail_unless(test)						\
   do {									\

tests/lfile.c

@@ -6,7 +6,7 @@
 static int fstab(void)
 {
 	int field = 1;
-	char *token, *dev;
+	char *token;
 	lfile_t *lf;
 
 	lf = lfopen(FSTAB, " \t\n");
@@ -15,12 +15,19 @@ static int fstab(void)
 		return 1;
 	}
 
+	printheader(NULL, "FILE SYSTEM                               MOUNT     OPTIONS            D P", 0);
 	while ((token = lftok(lf))) {
 		if (field == 1)
-			dev = token;
+			printf("%-41s ", token);
+		if (field == 2)
+			printf("%-9s ", token);
+		if (field == 4)
+			printf("%-17s  ", token);
+		if (field == 5)
+			printf("%d ", atoi(token));
 		if (field == 6) {
 			field = 0;
-			printf("Found %s passno %d\n", dev, atoi(token));
+			printf("%d\n", atoi(token));
 		}
 
 		field++;

tests/makepath.c

@@ -4,7 +4,7 @@
 #include <stdlib.h>
 #include "check.h"
 
-int checkpath(char *dir)
+int checkpath(const char *dir)
 {
 	char tmp[256];
 	struct stat sb;
@@ -20,7 +20,7 @@ int checkpath(char *dir)
 	return 1;
 }
 
-int test_makepath(char *dir)
+int test_makepath(const char *dir)
 {
 	int ret = makepath(dir);
 

tests/pidfile.c

@@ -6,8 +6,6 @@
 
 #include "check.h"
 
-#define PRINT(args...) if (verbose) printf(args)
-
 extern char *__pidfile_name;
 extern char *__pidfile_path;
 
@@ -17,13 +15,13 @@ static char PIDFILE[42];
 static int verbose = 0;
 static struct stat before, after;
 
-static void sigterm_handler(int UNUSED(signo))
+static void sigterm_handler(int signo)
 {
 	PRINT("Exiting ...\n");
 	remove(PIDFILE);
 }
 
-static void sigalrm_handler(int UNUSED(signo))
+static void sigalrm_handler(int signo)
 {
 	PRINT("Calling pidfile(%s)\n", pidfile_arg ?: "NULL");
 	if (pidfile(pidfile_arg))

tests/progress.c

@@ -2,7 +2,6 @@
 #include <unistd.h>		/* usleep() */
 
 #include "check.h"
-#include "../conio.h"
 
 #define MAX_WIDTH    80
 #define msleep(msec) usleep(msec * 1000)

tests/rsync.c

@@ -53,9 +53,9 @@ static void check_tree(char *heading, char *dir)
 	if (verbose) {
 		if (heading)
 			puts(heading);
-
-		tree(dir, 1);
 	}
+
+	// XXX: Fixme, add code to list tree, nftw() possibly
 }
 
 int run_test(void)
@@ -72,7 +72,8 @@ int run_test(void)
 #endif
 
 	setup_test();
-	result += rsync(BASE "src", DST, 0, NULL);
+	sleep(1);
+	result += rsync(BASE "src", DST, LITE_FOPT_KEEP_MTIME, NULL);
 	check_tree("Only partial rsync of src <-- No slash!", BASE);
 #if 0
 	cleanup_test();

tests/tempfile.c

@@ -8,18 +8,29 @@
 #warning O_TMPFILE is missing, either too old GLIBC, Linux, or non-Linux system
 #endif
 
+#define READBACK "Reality is frequently inaccurate.\n"
+
+
 int main(void)
 {
+	int ret;
 	FILE *fp;
+	char buf[80] = "";
 
 	printf("Before tempfile():\n");
-	system("ls -lrt " _PATH_TMP " | tail -3");
+	ret = system("ls -lrt " _PATH_TMP " | tail -3");
 
 	fp = tempfile();
 	fail_unless(fp != NULL);
 
+	ret = fputs(READBACK, fp);
+	rewind(fp);
+	if (fgets(buf, sizeof(buf), fp))
+		fprintf(stderr, "\nRead-back from tempfile: %s", buf);
+	fail_unless(!strcmp(buf, READBACK));
+
 	printf("\nAfter tempfile(), should be same list:\n");
-	system("ls -lrt " _PATH_TMP " | tail -3");
+	ret = system("ls -lrt " _PATH_TMP " | tail -3");
 
 	return fclose(fp);
 }

tests/touch.c

@@ -0,0 +1,61 @@
+#include <err.h>
+#include <paths.h>
+#include <signal.h>
+#include <stdarg.h>
+#include <time.h>
+
+#include "check.h"
+
+int verbose = 0;
+
+
+static int mtime(char *file)
+{
+	int ret;
+	char buf[80];
+	struct stat before, after;
+
+	PRINT("Calling touch() to create file ...\n");
+	touch(file);
+	stat(file, &before);
+
+	/* Must sleep a while here otherwise we execute too fast => no mtime change :-( */
+	usleep(10000);
+
+	PRINT("Calling touch() again to update mtime ...\n");
+	if (touch(file)) {
+		erase(file);
+		err(1, "Failed creating %s", file);
+	}
+	stat(file, &after);
+
+	ret = timespec_newer(&after.st_mtim, &before.st_mtim);
+	PRINT("Before: %s\n", timespec2str(&before.st_mtim, buf, sizeof(buf)));
+	PRINT("After : %s\n", timespec2str(&after.st_mtim, buf, sizeof(buf)));
+
+	return !ret;
+}
+
+int main(int argc, char *argv[])
+{
+	int fd;
+	char file[42] = "/tmp/touch_test.XXXXXX";
+
+	if (argc > 1 && !strcmp(argv[1], "-v"))
+		verbose = 1;
+
+	fd = mkstemp(file);
+	if (fd < 0)
+		err(1, "Failed creating tempfile, %s", file);
+	close(fd);
+
+	return mtime(file);
+}
+
+/**
+ * Local Variables:
+ *  indent-tabs-mode: t
+ *  c-file-style:     "linux"
+ *  compile-command:  "make pidfile && ./pidfile -v"
+ * End:
+ */

tests/tree.c

@@ -1,19 +0,0 @@
-#include "check.h"
-
-int main(void)
-{
-	int result = 0;
-	size_t i;
-	struct { char *path; int fail; } arr[] = {
-		{ "/etc/passwd", -1 },
-		{ "/dev",         0 },
-		{ "/sbin",        0 },
-	};
-
-	for (i = 0; i < NELEMS(arr); i++) {
-		if (tree(arr[i].path, 1) != arr[i].fail)
-			result++;
-	}
-
-	return result;
-}

tests/which.c

@@ -0,0 +1,50 @@
+#include "check.h"
+
+struct tc {
+	char *cmd;
+	int   exp;
+	int   res;
+};
+
+int main(void)
+{
+	int result = 0;
+	size_t i;
+	struct tc test[] = {
+		{ "ls",             1 },
+		{ "free",           1 },
+		{ "modinfo",        1 },
+		{ "useradd",        1 },
+		{ "/usr/bin/which", 1 },
+		{ "/bin/ps aux",    1 },
+		{ "/etc/passwd",    0 },
+		{ NULL, 0 }
+	};
+
+	setenv("PATH", "/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin", 1);
+	for (i = 0; test[i].cmd; i++) {
+		char *path;
+
+		path = which(test[i].cmd);
+		if (!path) {
+			test[i].res = 0;
+			fprintf(stderr, "%20s : Not hot dog\n", test[i].cmd);
+		} else {
+			test[i].res = 1;
+			fprintf(stderr, "%20s : hot dog --> %s\n", test[i].cmd, path);
+			free(path);
+		}
+	}
+
+	for (i = 0; test[i].cmd; i++)
+		result += test[i].exp != test[i].res;
+
+	return result;
+}
+
+/**
+ * Local Variables:
+ *  indent-tabs-mode: t
+ *  c-file-style: "linux"
+ * End:
+ */

tree.c

@@ -1,128 +0,0 @@
-/* Simple /bin/tree replacement
- *
- * Copyright (c) 2015  Joachim Nilsson <troglobit@gmail.com>
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <errno.h>
-#include <dirent.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
-static int all = 0;
-
-static int filter(const struct dirent *entry)
-{
-	/* Skip current dir ".", and prev dir "..", from list of files */
-	if ((1 == strlen(entry->d_name) && entry->d_name[0] == '.') ||
-	    (2 == strlen(entry->d_name) && !strcmp(entry->d_name, "..")))
-		return 0;
-
-	if (!all && entry->d_name[0] == '.')
-		return 0;
-	
-	return 1;
-}
-
-static void get_perms(struct stat *st, char *buf, size_t len)
-{
-	mode_t m = st->st_mode;
-
-	snprintf(buf, len, "[%c%c%c%c%c%c%c%c%c%c] ",
-		 S_ISCHR(m) ? 'c' : S_ISBLK(m) ? 'b' : S_ISFIFO(m) ? 'p' : S_ISLNK(m) ? 'l' : S_ISSOCK(m) ? 's' : '-',
-		 (m & S_IRUSR) ? 'r' : '-',
-		 (m & S_IWUSR) ? 'w' : '-',
-		 (m & S_ISUID ) ? 's' : (m & S_IXUSR) ? 'x' : '-',
-		 (m & S_IRGRP) ? 'r' : '-',
-		 (m & S_IWGRP) ? 'w' : '-',
-		 (m & S_ISGID) ? 's' : (m & S_IXGRP) ? 'x' : '-',
-		 (m & S_IROTH) ? 'r' : '-',
-		 (m & S_IWOTH) ? 'w' : '-',
-		 (m & S_IXOTH) ? 'x' : '-'
-		);
-}
-
-static int descend(char *path, int show_perms, char *pfx)
-{
-	int result = 0;
-	struct stat st;
-
-	if (-1 == lstat(path, &st))
-		return 1;
-
-	if ((st.st_mode & S_IFMT) == S_IFDIR) {
-		int i, n;
-		struct dirent **namelist = NULL;
-
-		n = scandir(path, &namelist, filter, alphasort);
-		if (n) {
-			for (i = 0; i < n; i++) {
-				char t = ' ', p[14] = "", s[256] = "";
-				char buf[256];
-				char dir[80];
-
-				if (i + 1 == n) {
-					printf("%s `- ", pfx);
-					snprintf(dir, sizeof(dir), "%s     ", pfx);
-				} else {
-					printf("%s|-- ", pfx);
-					snprintf(dir, sizeof(dir), "%s|    ", pfx);
-				}
-
-				snprintf(buf, sizeof(buf), "%s/%s", path, namelist[i]->d_name);
-				if (!lstat(buf, &st)) {
-					if (show_perms)
-						get_perms(&st, p, sizeof(p));
-					if ((st.st_mode & S_IFMT) == S_IFDIR)
-						t = '/';
-					if (S_ISLNK(st.st_mode)) {
-						snprintf(s, sizeof(s), "-> ");
-						if (-1 == readlink(buf, &s[3], sizeof(s) - 3))
-							s[0] = 0;
-					}
-				}
-
-				printf("%s%s%c%s\n", p, namelist[i]->d_name, t, s);
-				if (t == '/')
-					result += descend(buf, show_perms, dir);
-
-				free(namelist[i]);
-			}
-
-			free(namelist);
-		}
-	} else {
-		errno = ENOTDIR;
-		result = -1;
-	}
-
-	return result;
-}
-
-int tree(char *path, int show_perms)
-{
-	printf("[%s]\n", path);
-	return descend(path, show_perms, "");
-}
-
-/**
- * Local Variables:
- *  indent-tabs-mode: t
- *  c-file-style: "linux"
- * End:
- */