chore: sync repo

test-driver

@@ -1,153 +0,0 @@
-#! /bin/sh
-# test-driver - basic testsuite driver script.
-
-scriptversion=2018-03-07.03; # UTC
-
-# Copyright (C) 2011-2021 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-# Make unconditional expansion of undefined variables an error.  This
-# helps a lot in preventing typo-related bugs.
-set -u
-
-usage_error ()
-{
-  echo "$0: $*" >&2
-  print_usage >&2
-  exit 2
-}
-
-print_usage ()
-{
-  cat <<END
-Usage:
-  test-driver --test-name NAME --log-file PATH --trs-file PATH
-              [--expect-failure {yes|no}] [--color-tests {yes|no}]
-              [--enable-hard-errors {yes|no}] [--]
-              TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS]
-
-The '--test-name', '--log-file' and '--trs-file' options are mandatory.
-See the GNU Automake documentation for information.
-END
-}
-
-test_name= # Used for reporting.
-log_file=  # Where to save the output of the test script.
-trs_file=  # Where to save the metadata of the test run.
-expect_failure=no
-color_tests=no
-enable_hard_errors=yes
-while test $# -gt 0; do
-  case $1 in
-  --help) print_usage; exit $?;;
-  --version) echo "test-driver $scriptversion"; exit $?;;
-  --test-name) test_name=$2; shift;;
-  --log-file) log_file=$2; shift;;
-  --trs-file) trs_file=$2; shift;;
-  --color-tests) color_tests=$2; shift;;
-  --expect-failure) expect_failure=$2; shift;;
-  --enable-hard-errors) enable_hard_errors=$2; shift;;
-  --) shift; break;;
-  -*) usage_error "invalid option: '$1'";;
-   *) break;;
-  esac
-  shift
-done
-
-missing_opts=
-test x"$test_name" = x && missing_opts="$missing_opts --test-name"
-test x"$log_file"  = x && missing_opts="$missing_opts --log-file"
-test x"$trs_file"  = x && missing_opts="$missing_opts --trs-file"
-if test x"$missing_opts" != x; then
-  usage_error "the following mandatory options are missing:$missing_opts"
-fi
-
-if test $# -eq 0; then
-  usage_error "missing argument"
-fi
-
-if test $color_tests = yes; then
-  # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'.
-  red='' # Red.
-  grn='' # Green.
-  lgn='' # Light green.
-  blu='' # Blue.
-  mgn='' # Magenta.
-  std=''     # No color.
-else
-  red= grn= lgn= blu= mgn= std=
-fi
-
-do_exit='rm -f $log_file $trs_file; (exit $st); exit $st'
-trap "st=129; $do_exit" 1
-trap "st=130; $do_exit" 2
-trap "st=141; $do_exit" 13
-trap "st=143; $do_exit" 15
-
-# Test script is run here. We create the file first, then append to it,
-# to ameliorate tests themselves also writing to the log file. Our tests
-# don't, but others can (automake bug#35762).
-: >"$log_file"
-"$@" >>"$log_file" 2>&1
-estatus=$?
-
-if test $enable_hard_errors = no && test $estatus -eq 99; then
-  tweaked_estatus=1
-else
-  tweaked_estatus=$estatus
-fi
-
-case $tweaked_estatus:$expect_failure in
-  0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;
-  0:*)   col=$grn res=PASS  recheck=no  gcopy=no;;
-  77:*)  col=$blu res=SKIP  recheck=no  gcopy=yes;;
-  99:*)  col=$mgn res=ERROR recheck=yes gcopy=yes;;
-  *:yes) col=$lgn res=XFAIL recheck=no  gcopy=yes;;
-  *:*)   col=$red res=FAIL  recheck=yes gcopy=yes;;
-esac
-
-# Report the test outcome and exit status in the logs, so that one can
-# know whether the test passed or failed simply by looking at the '.log'
-# file, without the need of also peaking into the corresponding '.trs'
-# file (automake bug#11814).
-echo "$res $test_name (exit status: $estatus)" >>"$log_file"
-
-# Report outcome to console.
-echo "${col}${res}${std}: $test_name"
-
-# Register the test result, and other relevant metadata.
-echo ":test-result: $res" > $trs_file
-echo ":global-test-result: $res" >> $trs_file
-echo ":recheck: $recheck" >> $trs_file
-echo ":copy-in-global-log: $gcopy" >> $trs_file
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'before-save-hook 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC0"
-# time-stamp-end: "; # UTC"
-# End:

tools/Makefile.am

@@ -6,7 +6,7 @@ bin_PROGRAMS = mkfs.stpd tools.stpd
 mkfs_stpd_SOURCES = mkfs/main.c
 mkfs_stpd_LDADD = ../lib/libstpdfs.a mkfs/bootsector.o
 
-tools_stpd_SOURCES = tools/main.c
+tools_stpd_SOURCES = tools/main.c tools/ls.c tools/copy.c
 
 mkfs/boot.o: mkfs/boot.asm
 	$(NASM) -fbin -o $@ $<

tools/mkfs/boot.asm

@@ -4,6 +4,7 @@
 	LOADER_BASE  equ 0x1000
 	DISK_BUFFER  equ 0x8000
 	STPDFS_MAGIC equ 0x44505453
+	BLOCK_SIZE   equ 512
 	INODE_SIZE   equ 34
 	INODE_ALLOCATED equ (1<<15)
 	CR equ 0xD
@@ -98,6 +99,15 @@ start:
 	mov dword eax, [DISK_BUFFER + 34 * 2 + inode.size] ; size
 	mov dword [uFsize], eax
 
+	xor ecx, ecx
+.read_loop:
+
+	cmp dword ecx, [uFsize]
+	jg .all_read
+	add ecx, BLOCK_SIZE
+	jmp .read_loop
+.all_read:
+
 	mov eax, DISK_BUFFER + 34 * 2 + 14 ; first zone
 
 	mov ax, LOADER_BASE/10
@@ -130,10 +140,9 @@ bios_print:
 .end:
 	ret
 
-szMsgHello: db "Hello world", CR, LF, 0
 szErrorNoLoader: db "Loader not found", CR, LF, 0
-szErrorBadMagic: db "Invalid magic number", CR, LF, 0
+szErrorBadMagic: db "Err: magic", CR, LF, 0
-szErrorLBA: db "LBA not supported", CR, LF, 0
+szErrorLBA: db "Err: LBA", CR, LF, 0
 uFsize: dd 0
 
 disk_read_sectors:

tools/tools/copy.c

@@ -0,0 +1,24 @@
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif /* HAVE_CONFIG_H */
+#ifdef HAVE_LIBGEN_H
+# include <libgen.h>
+#endif /* HAVE_LIBGEN_H */
+#ifdef HAVE_GETOPT_H
+# include <getopt.h>
+#endif /* HAVE_GETOPT_H */
+
+static void
+usage(void)
+{
+
+}
+
+int
+copy(int argc, char **argv)
+{
+    
+    return (EXIT_SUCCESS);
+}

tools/tools/ls.c

@@ -0,0 +1,24 @@
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif /* HAVE_CONFIG_H */
+#ifdef HAVE_LIBGEN_H
+# include <libgen.h>
+#endif /* HAVE_LIBGEN_H */
+#ifdef HAVE_GETOPT_H
+# include <getopt.h>
+#endif /* HAVE_GETOPT_H */
+
+static void
+usage(void)
+{
+
+}
+
+int
+ls(int argc, char **argv)
+{
+    
+    return (EXIT_SUCCESS);
+}

tools/tools/main.c

@@ -1,5 +1,102 @@
-int
+#include <stdio.h>
-main(void)
+#include <stdlib.h>
+#include <string.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif /* HAVE_CONFIG_H */
+#ifdef HAVE_LIBGEN_H
+# include <libgen.h>
+#endif /* HAVE_LIBGEN_H */
+#ifdef HAVE_GETOPT_H
+# include <getopt.h>
+#endif /* HAVE_GETOPT_H */
+#include "tools.h"
+
+struct command {
+    const char *name;
+    int (*cmd)(int argc, char **argv);
+};
+
+struct command commands[] = {
+    {"ls", &ls},
+    {"copy", &copy},
+    {NULL, NULL}
+};
+
+static const char *prg_name;
+
+static void
+usage(int retval)
 {
-    return (0);
+    int idx;
+
+	if (retval == EXIT_FAILURE)
+	{
+		fprintf(stderr, "Try '%s -h' for more information.\n", prg_name);
+	}
+	else
+	{
+		printf("Usage: %s COMMAND [OPTIONS]\n\n", prg_name);
+		printf("Commands:\n");
+        printf("\t");
+        for (idx = 0; commands[idx].name != NULL; idx++)
+        {
+            printf("%s ", commands[idx].name);
+        }
+        printf("\n");
+
+		printf("For more details see tools.stpd(8).\n");
+	}
+	exit(retval);
+}
+
+static void
+version(void)
+{
+	printf("%s (%s) %s\n", prg_name, PACKAGE_NAME, PACKAGE_VERSION);
+	exit(EXIT_SUCCESS);
+}
+int
+main(int argc, char **argv)
+{
+    int idx;
+
+#ifdef HAVE_LIBGEN_H
+    prg_name = basename(argv[0]);
+#else
+    prg_name = argv[0];
+#endif /* HAVE_LIBGEN_H */
+
+    if (argc < 2)
+    {
+        usage(EXIT_FAILURE);
+    }
+
+    if (argv[1][0] == '-')
+    {
+        switch(argv[1][1])
+        {
+            case 'h':
+                usage(EXIT_SUCCESS);
+                break;
+            
+            case 'V':
+                version();
+                break;
+
+            default:
+                usage(EXIT_FAILURE);
+                break;
+        }
+    }
+
+    for (idx = 0; commands[idx].name != NULL; idx++)
+    {
+        if (strcmp(argv[1], commands[idx].name) == 0)
+        {
+            return (commands[idx].cmd(argc-1, argv+1));
+        }
+    }
+
+    return (EXIT_FAILURE);
 }

tools/tools/tools.h

@@ -0,0 +1,7 @@
+#ifndef TOOLS_H
+# define TOOLS_H 1
+
+int ls(int argc, char **argv);
+int copy(int argc, char **argv);
+
+#endif /* !TOOLS_H */