From 81f4a773332109b3d83456550f1af108a41342d3 Mon Sep 17 00:00:00 2001 From: Kyle Isom Date: Fri, 14 Feb 2020 23:12:10 -0800 Subject: [PATCH] everything in its own place --- Makefile.am | 11 ---- autobuild.sh | 11 ---- configure.ac | 19 ------ doc/Makefile.am | 3 - doc/README.kst | 36 ---------- doc/srm.1 | 84 ------------------------ {src => libdirutils}/dirlist.c | 0 {tests => libdirutils}/dirlist_test.c | 0 {src => libdirutils}/dirutils.c | 0 {tests => libdirutils}/dirutils_test.c | 0 {src => libdirutils}/dirwalk.c | 0 {src => libdirutils}/kst/dirlist.h | 0 {src => libdirutils}/kst/dirutils.h | 0 {doc => libdirutils}/libdirutils.3 | 0 {src => libiniparser}/iniparser.c | 0 {tests => libiniparser}/iniparser_test.c | 0 {src => libiniparser}/kst/iniparser.h | 0 {doc => libiniparser}/libiniparser.3 | 0 src/Makefile.am | 19 ------ tests/Makefile.am | 9 --- 20 files changed, 192 deletions(-) delete mode 100644 Makefile.am delete mode 100755 autobuild.sh delete mode 100644 configure.ac delete mode 100644 doc/Makefile.am delete mode 100644 doc/README.kst delete mode 100644 doc/srm.1 rename {src => libdirutils}/dirlist.c (100%) rename {tests => libdirutils}/dirlist_test.c (100%) rename {src => libdirutils}/dirutils.c (100%) rename {tests => libdirutils}/dirutils_test.c (100%) rename {src => libdirutils}/dirwalk.c (100%) rename {src => libdirutils}/kst/dirlist.h (100%) rename {src => libdirutils}/kst/dirutils.h (100%) rename {doc => libdirutils}/libdirutils.3 (100%) rename {src => libiniparser}/iniparser.c (100%) rename {tests => libiniparser}/iniparser_test.c (100%) rename {src => libiniparser}/kst/iniparser.h (100%) rename {doc => libiniparser}/libiniparser.3 (100%) delete mode 100644 src/Makefile.am delete mode 100644 tests/Makefile.am diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 7764db9..0000000 --- a/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -SUBDIRS = src tests doc - -TESTS = tests/dirlist_test \ - tests/dirutils_test \ - tests/iniparser-test -dist_noinst_DATA = LICENSE \ - testdata \ - README \ - autobuild.sh - -test: check diff --git a/autobuild.sh b/autobuild.sh deleted file mode 100755 index cbeb3fa..0000000 --- a/autobuild.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -# performs a full clean, autoreconf, configure with appropriate options, -# make, and make check: it starts from scratch, with a clean dev checkout -# and performs everything necessary to run the unit tests. - -echo "[+] performing autobuild" ; \ - autoreconf -i && \ - ./configure && \ - make clean && \ - make && \ - make check diff --git a/configure.ac b/configure.ac deleted file mode 100644 index 9944fa0..0000000 --- a/configure.ac +++ /dev/null @@ -1,19 +0,0 @@ -AC_PREREQ([2.59]) -AC_INIT([kst], [1.0.0], [kyle@imap.cc], - [libdirutils], [https://hg.sr.ht/~kisom/kst]) -AM_INIT_AUTOMAKE([1.11 foreign subdir-objects]) -AC_CONFIG_SRCDIR([doc/srm.1]) -AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile tests/Makefile]) -AC_PROG_CC -AC_PROG_INSTALL -AC_PROG_RANLIB - -NO_CUNIT_MSG=" - ============================================== - Warning: CUnit was not found; will not be able - to run unit tests! - ============================================== -" -AC_SEARCH_LIBS([CU_initialize_registry], [cunit], - [], [AC_MSG_WARN($NO_CUNIT_MSG)]) -AC_OUTPUT diff --git a/doc/Makefile.am b/doc/Makefile.am deleted file mode 100644 index 47ad617..0000000 --- a/doc/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -dist_man1_MANS = srm.1 -dist_man3_MANS = libdirutils.3 libiniparser.3 - diff --git a/doc/README.kst b/doc/README.kst deleted file mode 100644 index dd42197..0000000 --- a/doc/README.kst +++ /dev/null @@ -1,36 +0,0 @@ -srm - securely wipe files --------------------------- -srm is a utility to overwrite files with random data in one or more passes. - - -Dependencies ------------- -None. - - -Compatibility -------------- -srm has been tested on the following operating systems: - * OpenBSD (5.1-snap) - * OS X (10.8) - * Linux (Debian 6.0) - - -Installation ------------- -make build install - - -Usage ------ -srm [-v] [-n number] file list - -options: - -n : specify number of passes - (default is 3 passes) - -v: verbose mode. display list of failures and wiped files after wiping - - -Known bugs / caveats --------------------- -srm can't recursively remove files, i.e. it can't remove directories. diff --git a/doc/srm.1 b/doc/srm.1 deleted file mode 100644 index 3837af0..0000000 --- a/doc/srm.1 +++ /dev/null @@ -1,84 +0,0 @@ -.Dd $Mdocdate$ -.Dt SRM 1 -.Os -.Sh NAME -.Nm srm -.Nd securely delete files -.Sh SYNOPSIS -.Nm -.Op Fl h -.Op Fl n Ar number -.Op Fl r -.Op Fl v -.Op Fl V -.Ar files -.Sh DESCRIPTION -.Nm -is a simple secure file deletion tool. It overwrites the file with several -passes of random data before unlinking it. If no options are specified, Nm -defaults to three passes. -.Nm -supports the following options: -.Bl -tag -width .Ds -.It Fl h -Display a brief help message. -.It Fl n Ar number -Specify the number of times to overwrite each target with random data. -.It Fl r -Recursive mode. Delete any directories and all subdirectories underneath. -.It Fl v -Verbose mode. Displays a list of both files that failed to wipe and files that -were successfully wiped. -.It Fl V -Print version information. -.El -.Sh EXIT STATUS -.Ex -std -The exit values are standard -.Xr sysexits 3 -values. -.Sh EXAMPLES -Wipe files -.Pa foo -and -.Pa bar -with three passes: -.Dl $ srm foo bar -Wipe files -.Pa baz -and -.Pa quux -with ten passes: -.Dl $ srm -n 10 baz quux -Wipe all PGP keys, i.e. files with extension -.Pa *.asc : -.Dl $ srm *.asc -Recursive deletes aren't implemented yet. A workaround is to use -.Nm -and -.Xr find 1 , -for example to delete all -.Pa *.pgp -files: -.Dl $ find . -iname '*.pgp' -exec srm '{}' \; -.Sh DIAGNOSTICS -.Nm -uses the standard -.Xr err 3 -facilities to report any errors that occur. -.Sh SEE ALSO -The srm page on -.Lk http://www.tyrfingr.is/projects/srm/ "tyrfinger" . -.Sh STANDARDS -.Nm -conforms to -.St -ansiC . -.Sh AUTHORS -.Nm -was written by -.An "Kyle Isom" Aq Mt kyle@tyrfingr.is . -.Sh BUGS -None known. Report bugs to the author. -.Sh LICENSE -.Nm -is released under an ISC license. diff --git a/src/dirlist.c b/libdirutils/dirlist.c similarity index 100% rename from src/dirlist.c rename to libdirutils/dirlist.c diff --git a/tests/dirlist_test.c b/libdirutils/dirlist_test.c similarity index 100% rename from tests/dirlist_test.c rename to libdirutils/dirlist_test.c diff --git a/src/dirutils.c b/libdirutils/dirutils.c similarity index 100% rename from src/dirutils.c rename to libdirutils/dirutils.c diff --git a/tests/dirutils_test.c b/libdirutils/dirutils_test.c similarity index 100% rename from tests/dirutils_test.c rename to libdirutils/dirutils_test.c diff --git a/src/dirwalk.c b/libdirutils/dirwalk.c similarity index 100% rename from src/dirwalk.c rename to libdirutils/dirwalk.c diff --git a/src/kst/dirlist.h b/libdirutils/kst/dirlist.h similarity index 100% rename from src/kst/dirlist.h rename to libdirutils/kst/dirlist.h diff --git a/src/kst/dirutils.h b/libdirutils/kst/dirutils.h similarity index 100% rename from src/kst/dirutils.h rename to libdirutils/kst/dirutils.h diff --git a/doc/libdirutils.3 b/libdirutils/libdirutils.3 similarity index 100% rename from doc/libdirutils.3 rename to libdirutils/libdirutils.3 diff --git a/src/iniparser.c b/libiniparser/iniparser.c similarity index 100% rename from src/iniparser.c rename to libiniparser/iniparser.c diff --git a/tests/iniparser_test.c b/libiniparser/iniparser_test.c similarity index 100% rename from tests/iniparser_test.c rename to libiniparser/iniparser_test.c diff --git a/src/kst/iniparser.h b/libiniparser/kst/iniparser.h similarity index 100% rename from src/kst/iniparser.h rename to libiniparser/kst/iniparser.h diff --git a/doc/libiniparser.3 b/libiniparser/libiniparser.3 similarity index 100% rename from doc/libiniparser.3 rename to libiniparser/libiniparser.3 diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index 2f14feb..0000000 --- a/src/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -CFLAGS := -pedantic -Wall -Werror -Wextra -O2 -std=c99 -g - -lib_LIBRARIES := libdirutils.a libiniparser.a -nobase_include_HEADERS := kst/dirutils.h \ - kst/iniparser.h -dist_noinst_HEADERS = kst/dirlist.h -bin_PROGRAMS = srm - - -## programs -srm_SOURCES = srm.c - - -## libraries -libdirutils_a_SOURCES = dirutils.c dirlist.c dirwalk.c dirlist.h -libiniparser_a_SOURCES = iniparser.c - - - diff --git a/tests/Makefile.am b/tests/Makefile.am deleted file mode 100644 index 57db808..0000000 --- a/tests/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -AM_LDFLAGS = -L/usr/local/lib -lcunit -AM_CFLAGS = -Wall -g -I/usr/local/include -I../src -O0 - -check_PROGRAMS = dirlist_test dirutils_test iniparser-test -dirlist_test_SOURCES = dirlist_test.c ../src/dirlist.c -dirutils_test_SOURCES = dirutils_test.c ../src/dirlist.c ../src/dirutils.c -iniparser_test_SOURCES = iniparser_test.c ../src/iniparser.c - -