diff --git a/TODO b/TODO index 111b922..b8de7e8 100644 --- a/TODO +++ b/TODO @@ -4,6 +4,7 @@ With "micro-" prefix tail expr uniq +seq od split date diff --git a/build.sh b/build.sh index a8fe8f7..65c3515 100755 --- a/build.sh +++ b/build.sh @@ -1,6 +1,6 @@ #!/bin/bash PROJECT_DIR=$(pwd) -CFLAGS="-Wall -Wextra -I$PROJECT_DIR -I$PROJECT_DIR/libmu -lm" +CFLAGS="-Wall -Wextra -I$PROJECT_DIR -I$PROJECT_DIR/include/libmu -lm" projects="console-tools coreutils sysutils sysutils-linux findutils networking miscutils shell loginutils procps" CC=cc @@ -8,7 +8,7 @@ CC=cc for project in $projects; do echo "Chdir" $project - for p in $project/*; do + for p in src/$project/*; do echo " * Makeing" $p for i in $p; do diff --git a/example/fstab b/configs/fstab similarity index 100% rename from example/fstab rename to configs/fstab diff --git a/libmu/duration.h b/include/libmu/duration.h similarity index 100% rename from libmu/duration.h rename to include/libmu/duration.h diff --git a/libmu/get_stat.h b/include/libmu/get_stat.h similarity index 100% rename from libmu/get_stat.h rename to include/libmu/get_stat.h diff --git a/libmu/human.h b/include/libmu/human.h similarity index 100% rename from libmu/human.h rename to include/libmu/human.h diff --git a/libmu/make_path.h b/include/libmu/make_path.h similarity index 100% rename from libmu/make_path.h rename to include/libmu/make_path.h diff --git a/libmu/parse_mode.h b/include/libmu/parse_mode.h similarity index 100% rename from libmu/parse_mode.h rename to include/libmu/parse_mode.h diff --git a/libmu/parse_mount.h b/include/libmu/parse_mount.h similarity index 100% rename from libmu/parse_mount.h rename to include/libmu/parse_mount.h diff --git a/libmu/recurse.h b/include/libmu/recurse.h similarity index 100% rename from libmu/recurse.h rename to include/libmu/recurse.h diff --git a/libmu/unused.h b/include/libmu/unused.h similarity index 100% rename from libmu/unused.h rename to include/libmu/unused.h diff --git a/libmu/mount_opts.h b/libmu/mount_opts.h deleted file mode 100644 index a28ec0e..0000000 --- a/libmu/mount_opts.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _MOUNT_OPTS_H -#define _MOUNT_OPTS_H - -typedef struct { - char *title; - unsigned long opt -} MU_OPTS - -MU_OPTS mu_mount_opts[] = { - {"ro", }, -} - -#endif diff --git a/console-tools/clear/build.sh b/src/console-tools/clear/build.sh similarity index 100% rename from console-tools/clear/build.sh rename to src/console-tools/clear/build.sh diff --git a/console-tools/clear/clear.c b/src/console-tools/clear/clear.c similarity index 100% rename from console-tools/clear/clear.c rename to src/console-tools/clear/clear.c diff --git a/console-tools/reset/build.sh b/src/console-tools/reset/build.sh similarity index 100% rename from console-tools/reset/build.sh rename to src/console-tools/reset/build.sh diff --git a/console-tools/reset/reset.c b/src/console-tools/reset/reset.c similarity index 100% rename from console-tools/reset/reset.c rename to src/console-tools/reset/reset.c diff --git a/coreutils/basename/basename.c b/src/coreutils/basename/basename.c similarity index 100% rename from coreutils/basename/basename.c rename to src/coreutils/basename/basename.c diff --git a/coreutils/basename/build.sh b/src/coreutils/basename/build.sh similarity index 100% rename from coreutils/basename/build.sh rename to src/coreutils/basename/build.sh diff --git a/coreutils/cat/build.sh b/src/coreutils/cat/build.sh similarity index 100% rename from coreutils/cat/build.sh rename to src/coreutils/cat/build.sh diff --git a/coreutils/cat/cat.c b/src/coreutils/cat/cat.c similarity index 100% rename from coreutils/cat/cat.c rename to src/coreutils/cat/cat.c diff --git a/coreutils/chgrp/build.sh b/src/coreutils/chgrp/build.sh similarity index 100% rename from coreutils/chgrp/build.sh rename to src/coreutils/chgrp/build.sh diff --git a/coreutils/chgrp/chgrp.c b/src/coreutils/chgrp/chgrp.c similarity index 100% rename from coreutils/chgrp/chgrp.c rename to src/coreutils/chgrp/chgrp.c diff --git a/coreutils/chmod/build.sh b/src/coreutils/chmod/build.sh similarity index 100% rename from coreutils/chmod/build.sh rename to src/coreutils/chmod/build.sh diff --git a/coreutils/chmod/chmod.c b/src/coreutils/chmod/chmod.c similarity index 100% rename from coreutils/chmod/chmod.c rename to src/coreutils/chmod/chmod.c diff --git a/coreutils/chown/build.sh b/src/coreutils/chown/build.sh similarity index 100% rename from coreutils/chown/build.sh rename to src/coreutils/chown/build.sh diff --git a/coreutils/chown/chown.c b/src/coreutils/chown/chown.c similarity index 100% rename from coreutils/chown/chown.c rename to src/coreutils/chown/chown.c diff --git a/coreutils/chroot/build.sh b/src/coreutils/chroot/build.sh similarity index 100% rename from coreutils/chroot/build.sh rename to src/coreutils/chroot/build.sh diff --git a/coreutils/chroot/chroot.c b/src/coreutils/chroot/chroot.c similarity index 100% rename from coreutils/chroot/chroot.c rename to src/coreutils/chroot/chroot.c diff --git a/coreutils/cmp/build.sh b/src/coreutils/cmp/build.sh similarity index 100% rename from coreutils/cmp/build.sh rename to src/coreutils/cmp/build.sh diff --git a/coreutils/cmp/cmp.c b/src/coreutils/cmp/cmp.c similarity index 100% rename from coreutils/cmp/cmp.c rename to src/coreutils/cmp/cmp.c diff --git a/coreutils/cp/build.sh b/src/coreutils/cp/build.sh similarity index 100% rename from coreutils/cp/build.sh rename to src/coreutils/cp/build.sh diff --git a/coreutils/cp/cp.c b/src/coreutils/cp/cp.c similarity index 100% rename from coreutils/cp/cp.c rename to src/coreutils/cp/cp.c diff --git a/coreutils/dirname/build.sh b/src/coreutils/dirname/build.sh similarity index 100% rename from coreutils/dirname/build.sh rename to src/coreutils/dirname/build.sh diff --git a/coreutils/dirname/dirname.c b/src/coreutils/dirname/dirname.c similarity index 100% rename from coreutils/dirname/dirname.c rename to src/coreutils/dirname/dirname.c diff --git a/coreutils/du/build.sh b/src/coreutils/du/build.sh similarity index 100% rename from coreutils/du/build.sh rename to src/coreutils/du/build.sh diff --git a/coreutils/du/du.c b/src/coreutils/du/du.c similarity index 100% rename from coreutils/du/du.c rename to src/coreutils/du/du.c diff --git a/coreutils/echo/build.sh b/src/coreutils/echo/build.sh similarity index 100% rename from coreutils/echo/build.sh rename to src/coreutils/echo/build.sh diff --git a/coreutils/echo/echo.c b/src/coreutils/echo/echo.c similarity index 100% rename from coreutils/echo/echo.c rename to src/coreutils/echo/echo.c diff --git a/coreutils/env/build.sh b/src/coreutils/env/build.sh similarity index 100% rename from coreutils/env/build.sh rename to src/coreutils/env/build.sh diff --git a/coreutils/env/env.c b/src/coreutils/env/env.c similarity index 100% rename from coreutils/env/env.c rename to src/coreutils/env/env.c diff --git a/coreutils/false/build.sh b/src/coreutils/false/build.sh similarity index 100% rename from coreutils/false/build.sh rename to src/coreutils/false/build.sh diff --git a/coreutils/false/false.c b/src/coreutils/false/false.c similarity index 100% rename from coreutils/false/false.c rename to src/coreutils/false/false.c diff --git a/coreutils/head/build.sh b/src/coreutils/head/build.sh similarity index 100% rename from coreutils/head/build.sh rename to src/coreutils/head/build.sh diff --git a/coreutils/head/head.c b/src/coreutils/head/head.c similarity index 100% rename from coreutils/head/head.c rename to src/coreutils/head/head.c diff --git a/coreutils/id/build.sh b/src/coreutils/id/build.sh similarity index 100% rename from coreutils/id/build.sh rename to src/coreutils/id/build.sh diff --git a/coreutils/id/id.c b/src/coreutils/id/id.c similarity index 100% rename from coreutils/id/id.c rename to src/coreutils/id/id.c diff --git a/coreutils/ln/build.sh b/src/coreutils/ln/build.sh similarity index 100% rename from coreutils/ln/build.sh rename to src/coreutils/ln/build.sh diff --git a/coreutils/ln/ln.c b/src/coreutils/ln/ln.c similarity index 100% rename from coreutils/ln/ln.c rename to src/coreutils/ln/ln.c diff --git a/coreutils/logname/build.sh b/src/coreutils/logname/build.sh similarity index 100% rename from coreutils/logname/build.sh rename to src/coreutils/logname/build.sh diff --git a/coreutils/logname/logname.c b/src/coreutils/logname/logname.c similarity index 100% rename from coreutils/logname/logname.c rename to src/coreutils/logname/logname.c diff --git a/coreutils/ls/build.sh b/src/coreutils/ls/build.sh similarity index 100% rename from coreutils/ls/build.sh rename to src/coreutils/ls/build.sh diff --git a/coreutils/ls/ls.c b/src/coreutils/ls/ls.c similarity index 100% rename from coreutils/ls/ls.c rename to src/coreutils/ls/ls.c diff --git a/coreutils/mkdir/build.sh b/src/coreutils/mkdir/build.sh similarity index 100% rename from coreutils/mkdir/build.sh rename to src/coreutils/mkdir/build.sh diff --git a/coreutils/mkdir/mkdir.c b/src/coreutils/mkdir/mkdir.c similarity index 100% rename from coreutils/mkdir/mkdir.c rename to src/coreutils/mkdir/mkdir.c diff --git a/coreutils/mkfifo/build.sh b/src/coreutils/mkfifo/build.sh similarity index 100% rename from coreutils/mkfifo/build.sh rename to src/coreutils/mkfifo/build.sh diff --git a/coreutils/mkfifo/mkfifo.c b/src/coreutils/mkfifo/mkfifo.c similarity index 100% rename from coreutils/mkfifo/mkfifo.c rename to src/coreutils/mkfifo/mkfifo.c diff --git a/coreutils/mknod/build.sh b/src/coreutils/mknod/build.sh similarity index 100% rename from coreutils/mknod/build.sh rename to src/coreutils/mknod/build.sh diff --git a/coreutils/mknod/mknod.c b/src/coreutils/mknod/mknod.c similarity index 100% rename from coreutils/mknod/mknod.c rename to src/coreutils/mknod/mknod.c diff --git a/coreutils/mktemp/build.sh b/src/coreutils/mktemp/build.sh similarity index 100% rename from coreutils/mktemp/build.sh rename to src/coreutils/mktemp/build.sh diff --git a/coreutils/mktemp/mktemp.c b/src/coreutils/mktemp/mktemp.c similarity index 100% rename from coreutils/mktemp/mktemp.c rename to src/coreutils/mktemp/mktemp.c diff --git a/coreutils/mv/build.sh b/src/coreutils/mv/build.sh similarity index 100% rename from coreutils/mv/build.sh rename to src/coreutils/mv/build.sh diff --git a/coreutils/mv/mv.c b/src/coreutils/mv/mv.c similarity index 91% rename from coreutils/mv/mv.c rename to src/coreutils/mv/mv.c index 333f9ff..946d51d 100644 --- a/coreutils/mv/mv.c +++ b/src/coreutils/mv/mv.c @@ -48,8 +48,8 @@ int main(int argc, char **argv) { /* Move code */ for (int i = 0; i < argc - 1; i++) { - if (rename(argv[i], argv[argc - 1]) < 0) { - if (move(argv[i], argv[argc - 1])) { + if (move(argv[i], argv[argc - 1])) { + if (rename(argv[i], argv[argc - 1]) < 0) { if (f_flag) fprintf(stderr, "mv: %s %s\n", argv[i], strerror(errno)); diff --git a/coreutils/nice/build.sh b/src/coreutils/nice/build.sh similarity index 100% rename from coreutils/nice/build.sh rename to src/coreutils/nice/build.sh diff --git a/coreutils/nice/nice.c b/src/coreutils/nice/nice.c similarity index 100% rename from coreutils/nice/nice.c rename to src/coreutils/nice/nice.c diff --git a/coreutils/nl/build.sh b/src/coreutils/nl/build.sh similarity index 100% rename from coreutils/nl/build.sh rename to src/coreutils/nl/build.sh diff --git a/coreutils/nl/nl.c b/src/coreutils/nl/nl.c similarity index 100% rename from coreutils/nl/nl.c rename to src/coreutils/nl/nl.c diff --git a/coreutils/nohup/build.sh b/src/coreutils/nohup/build.sh similarity index 100% rename from coreutils/nohup/build.sh rename to src/coreutils/nohup/build.sh diff --git a/coreutils/nohup/nohup.c b/src/coreutils/nohup/nohup.c similarity index 100% rename from coreutils/nohup/nohup.c rename to src/coreutils/nohup/nohup.c diff --git a/coreutils/printenv/build.sh b/src/coreutils/printenv/build.sh similarity index 100% rename from coreutils/printenv/build.sh rename to src/coreutils/printenv/build.sh diff --git a/coreutils/printenv/printenv.c b/src/coreutils/printenv/printenv.c similarity index 100% rename from coreutils/printenv/printenv.c rename to src/coreutils/printenv/printenv.c diff --git a/coreutils/pwd/build.sh b/src/coreutils/printf/build.sh similarity index 100% rename from coreutils/pwd/build.sh rename to src/coreutils/printf/build.sh diff --git a/src/coreutils/printf/printf.c b/src/coreutils/printf/printf.c new file mode 100644 index 0000000..0ae0ec4 --- /dev/null +++ b/src/coreutils/printf/printf.c @@ -0,0 +1,5 @@ +#include + +int main(int argc, char **argv) { + return 0; +} diff --git a/coreutils/renice/build.sh b/src/coreutils/pwd/build.sh similarity index 100% rename from coreutils/renice/build.sh rename to src/coreutils/pwd/build.sh diff --git a/coreutils/pwd/pwd.c b/src/coreutils/pwd/pwd.c similarity index 100% rename from coreutils/pwd/pwd.c rename to src/coreutils/pwd/pwd.c diff --git a/coreutils/rev/build.sh b/src/coreutils/renice/build.sh similarity index 100% rename from coreutils/rev/build.sh rename to src/coreutils/renice/build.sh diff --git a/coreutils/renice/renice.c b/src/coreutils/renice/renice.c similarity index 100% rename from coreutils/renice/renice.c rename to src/coreutils/renice/renice.c diff --git a/coreutils/rm/build.sh b/src/coreutils/rev/build.sh similarity index 100% rename from coreutils/rm/build.sh rename to src/coreutils/rev/build.sh diff --git a/coreutils/rev/rev.c b/src/coreutils/rev/rev.c similarity index 100% rename from coreutils/rev/rev.c rename to src/coreutils/rev/rev.c diff --git a/coreutils/shred/build.sh b/src/coreutils/rm/build.sh similarity index 100% rename from coreutils/shred/build.sh rename to src/coreutils/rm/build.sh diff --git a/coreutils/rm/rm.c b/src/coreutils/rm/rm.c similarity index 100% rename from coreutils/rm/rm.c rename to src/coreutils/rm/rm.c diff --git a/coreutils/sleep/build.sh b/src/coreutils/shred/build.sh similarity index 100% rename from coreutils/sleep/build.sh rename to src/coreutils/shred/build.sh diff --git a/coreutils/shred/shred.c b/src/coreutils/shred/shred.c similarity index 100% rename from coreutils/shred/shred.c rename to src/coreutils/shred/shred.c diff --git a/coreutils/sync/build.sh b/src/coreutils/sleep/build.sh similarity index 100% rename from coreutils/sync/build.sh rename to src/coreutils/sleep/build.sh diff --git a/coreutils/sleep/sleep.c b/src/coreutils/sleep/sleep.c similarity index 100% rename from coreutils/sleep/sleep.c rename to src/coreutils/sleep/sleep.c diff --git a/coreutils/tee/build.sh b/src/coreutils/sync/build.sh similarity index 100% rename from coreutils/tee/build.sh rename to src/coreutils/sync/build.sh diff --git a/coreutils/sync/sync.c b/src/coreutils/sync/sync.c similarity index 100% rename from coreutils/sync/sync.c rename to src/coreutils/sync/sync.c diff --git a/coreutils/touch/build.sh b/src/coreutils/tee/build.sh similarity index 100% rename from coreutils/touch/build.sh rename to src/coreutils/tee/build.sh diff --git a/coreutils/tee/tee.c b/src/coreutils/tee/tee.c similarity index 100% rename from coreutils/tee/tee.c rename to src/coreutils/tee/tee.c diff --git a/coreutils/true/build.sh b/src/coreutils/touch/build.sh similarity index 100% rename from coreutils/true/build.sh rename to src/coreutils/touch/build.sh diff --git a/coreutils/touch/touch.c b/src/coreutils/touch/touch.c similarity index 100% rename from coreutils/touch/touch.c rename to src/coreutils/touch/touch.c diff --git a/coreutils/tty/build.sh b/src/coreutils/true/build.sh similarity index 100% rename from coreutils/tty/build.sh rename to src/coreutils/true/build.sh diff --git a/coreutils/true/true.c b/src/coreutils/true/true.c similarity index 100% rename from coreutils/true/true.c rename to src/coreutils/true/true.c diff --git a/coreutils/uname/build.sh b/src/coreutils/tty/build.sh similarity index 100% rename from coreutils/uname/build.sh rename to src/coreutils/tty/build.sh diff --git a/coreutils/tty/tty.c b/src/coreutils/tty/tty.c similarity index 100% rename from coreutils/tty/tty.c rename to src/coreutils/tty/tty.c diff --git a/coreutils/wc/build.sh b/src/coreutils/uname/build.sh similarity index 100% rename from coreutils/wc/build.sh rename to src/coreutils/uname/build.sh diff --git a/coreutils/uname/uname.c b/src/coreutils/uname/uname.c similarity index 100% rename from coreutils/uname/uname.c rename to src/coreutils/uname/uname.c diff --git a/coreutils/whoami/build.sh b/src/coreutils/wc/build.sh similarity index 100% rename from coreutils/whoami/build.sh rename to src/coreutils/wc/build.sh diff --git a/coreutils/wc/wc.c b/src/coreutils/wc/wc.c similarity index 100% rename from coreutils/wc/wc.c rename to src/coreutils/wc/wc.c diff --git a/coreutils/yes/build.sh b/src/coreutils/whoami/build.sh similarity index 100% rename from coreutils/yes/build.sh rename to src/coreutils/whoami/build.sh diff --git a/coreutils/whoami/whoami.c b/src/coreutils/whoami/whoami.c similarity index 100% rename from coreutils/whoami/whoami.c rename to src/coreutils/whoami/whoami.c diff --git a/findutils/xargs/build.sh b/src/coreutils/yes/build.sh similarity index 100% rename from findutils/xargs/build.sh rename to src/coreutils/yes/build.sh diff --git a/coreutils/yes/yes.c b/src/coreutils/yes/yes.c similarity index 100% rename from coreutils/yes/yes.c rename to src/coreutils/yes/yes.c diff --git a/loginutils/nologin/build.sh b/src/findutils/xargs/build.sh similarity index 100% rename from loginutils/nologin/build.sh rename to src/findutils/xargs/build.sh diff --git a/findutils/xargs/xargs.c b/src/findutils/xargs/xargs.c similarity index 100% rename from findutils/xargs/xargs.c rename to src/findutils/xargs/xargs.c diff --git a/miscutils/spark/build.sh b/src/loginutils/nologin/build.sh similarity index 100% rename from miscutils/spark/build.sh rename to src/loginutils/nologin/build.sh diff --git a/loginutils/nologin/nologin.c b/src/loginutils/nologin/nologin.c similarity index 100% rename from loginutils/nologin/nologin.c rename to src/loginutils/nologin/nologin.c diff --git a/networking/hostname/build.sh b/src/miscutils/spark/build.sh similarity index 100% rename from networking/hostname/build.sh rename to src/miscutils/spark/build.sh diff --git a/miscutils/spark/spark.c b/src/miscutils/spark/spark.c similarity index 100% rename from miscutils/spark/spark.c rename to src/miscutils/spark/spark.c diff --git a/networking/nc/build.sh b/src/networking/hostname/build.sh similarity index 100% rename from networking/nc/build.sh rename to src/networking/hostname/build.sh diff --git a/networking/hostname/hostname.c b/src/networking/hostname/hostname.c similarity index 100% rename from networking/hostname/hostname.c rename to src/networking/hostname/hostname.c diff --git a/procps/kill/build.sh b/src/networking/nc/build.sh similarity index 100% rename from procps/kill/build.sh rename to src/networking/nc/build.sh diff --git a/networking/nc/nc.c b/src/networking/nc/nc.c similarity index 100% rename from networking/nc/nc.c rename to src/networking/nc/nc.c diff --git a/procps/uptime/build.sh b/src/procps/kill/build.sh similarity index 100% rename from procps/uptime/build.sh rename to src/procps/kill/build.sh diff --git a/procps/kill/kill.c b/src/procps/kill/kill.c similarity index 92% rename from procps/kill/kill.c rename to src/procps/kill/kill.c index 826fc82..f6ca1e6 100644 --- a/procps/kill/kill.c +++ b/src/procps/kill/kill.c @@ -75,9 +75,10 @@ int main(int argc, char **argv) { int ret = 0; for (int i = 0; i < argc; i++) { - int sig = atoi(argv[i]); - if (kill(sig, signal)) { - fprintf(stderr, "kill: %d: %s\n", sig, strerror(errno)); + int pid = atoi(argv[i]); + + if (kill(pid, signal)) { + fprintf(stderr, "kill: %d: %s\n", pid, strerror(errno)); ret = 1; } } diff --git a/shell/rc/build.sh b/src/procps/uptime/build.sh similarity index 100% rename from shell/rc/build.sh rename to src/procps/uptime/build.sh diff --git a/procps/uptime/uptime.c b/src/procps/uptime/uptime.c similarity index 100% rename from procps/uptime/uptime.c rename to src/procps/uptime/uptime.c diff --git a/sysutils-linux/dmesg/build.sh b/src/shell/rc/build.sh similarity index 100% rename from sysutils-linux/dmesg/build.sh rename to src/shell/rc/build.sh diff --git a/shell/rc/rc.c b/src/shell/rc/rc.c similarity index 100% rename from shell/rc/rc.c rename to src/shell/rc/rc.c diff --git a/sysutils/mount/build.sh b/src/sysutils-linux/dmesg/build.sh similarity index 100% rename from sysutils/mount/build.sh rename to src/sysutils-linux/dmesg/build.sh diff --git a/sysutils-linux/dmesg/dmesg.c b/src/sysutils-linux/dmesg/dmesg.c similarity index 100% rename from sysutils-linux/dmesg/dmesg.c rename to src/sysutils-linux/dmesg/dmesg.c diff --git a/src/sysutils/mount/build.sh b/src/sysutils/mount/build.sh new file mode 100755 index 0000000..3b2db38 --- /dev/null +++ b/src/sysutils/mount/build.sh @@ -0,0 +1,2 @@ +#!/bin/sh +echo ./*.c $CFLAGS $OUTPUT | xargs $CC diff --git a/sysutils/mount/mount.c b/src/sysutils/mount/mount.c similarity index 100% rename from sysutils/mount/mount.c rename to src/sysutils/mount/mount.c