From 2a2c6e81937c137c336b6c7a2c95d7e02e7595d5 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Sun, 12 Feb 2023 02:00:11 +0000
Subject:  Fix .gitignore

Signed-off-by: Laurent Bercot <ska@appnovation.com>
---
 .gitignore             | 3 ++-
 tools/gen-multicall.sh | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index d77920a..4ac1130 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,8 @@
 *.so.*
 /config.mak
 /src/include/s6-portable-utils/config.h
+/src/multicall/s6-portable-utils.c
+/s6-portable-utils
 /s6-basename
 /s6-cat
 /s6-chmod
@@ -49,4 +51,3 @@
 /s6-unquote-filter
 /s6-update-symlinks
 /seekablepipe
-/s6-portable-utils
diff --git a/tools/gen-multicall.sh b/tools/gen-multicall.sh
index 50a9625..52c59ea 100755
--- a/tools/gen-multicall.sh
+++ b/tools/gen-multicall.sh
@@ -61,13 +61,13 @@ cat <<EOF
 } ;
 
 #define USAGE "$P subcommand [ arguments... ]"
-#define dieusage() strerr_dief1x(100, USAGE)
+#define dieusage() strerr_dieusage(100, USAGE)
 
 static int ${p}_main (int argc, char const *const *argv, char const *const *envp)
 {
   multicall_app const *p ;
   PROG = "$P" ;
-  if (!argc) dieusage() ;
+  if (argc < 2) dieusage() ;
   p = bsearch(argv[1], multicall_apps, sizeof(multicall_apps) / sizeof(multicall_app), sizeof(multicall_app), &multicall_app_cmp) ;
   if (!p) strerr_dief2x(100, "unknown subcommand: ", argv[1]) ;
   return (*(p->mainf))(argc-1, argv+1, envp) ;
-- 
cgit 1.4.1