Merge pull request #1231 from xexyl/1208

Partial fix to issue #1208

Please NOTE: This commit, while recommended, is not mandatory for IOCCC28.
             Existing submissions under the previously released mkiocccentry
             toolkit remain valid.

Author: lcn2

CHANGES.md

@@ -11,6 +11,13 @@ to true if the UUID was `"true"`.
 The `-u uuidfile` and `-U UUID` options may not be used with `-i answers`, `-d`
 or `-s seed`.
 
+Partial fix to issue #1208. The `-x` option to force delete the
+submission directory and `-r rm` option to set path to `rm(1)` were added to
+`mkiocccentry` as part of #1208. The change in order of args is **NOT** done and
+will not be done until **AFTER** IOCCC28.
+
+Fixed bug where `overwrite_answers` was always true by default (`mkiocccentry`).
+
 Updated man page for the above changes.
 
 **IMPORTANT NOTE**: you do NOT need to use this update in order to participate

mkiocccentry.c

@@ -184,7 +184,8 @@ static char *prompt(char const *str, size_t *lenp);
 static char *get_contest_id(bool *testp, char const *uuidf, char *uuidstr);
 static int get_submit_slot(struct info *infop);
 static char *mk_submission_dir(char const *workdir, char const *ioccc_id, int submit_slot,
-			  char **tarball_path, time_t tstamp, bool test_mode);
+			  char **tarball_path, time_t tstamp, bool test_mode, bool force_remove,
+                          char const *rm);
 static bool inspect_Makefile(char const *Makefile, struct info *infop);
 static void warn_Makefile(struct info *infop);
 static void check_Makefile(struct info *infop, char const *Makefile);

mkiocccentry.h

@@ -220,7 +220,8 @@ if this option is not specified.
 Pass
 .B \-e
 to
-.BR txzchk (1).
+.BR txzchk (1)
+(entertainment mode).
 .TP
 .BI \-f\  feathers
 Pass
@@ -384,6 +385,18 @@ option.
 If the path is a directory
 .BR mkiocccentry (1)
 will not traverse it.
+.TP
+.BI \-r\  rm
+Set path to
+.BR rm (1)
+if
+.B \-x
+used.
+.TP
+.B \-x
+Force delete submission directory if it already exists.
+Use with
+.BR CARE !
 .SH EXIT STATUS
 .TP
 0

soup/man/man1/mkiocccentry.1

@@ -102,11 +102,14 @@ ioccc_sanity_chks(void)
  *	chkentry	    - if -C chkentry was used and chkentry != NULL set *chkentry to path
  *	make_flag_used      - true ==> -m make was used
  *	make                - if -m make was used and make != NULL set *make to path
+ *	rm_flag_used        - true ==> -r rm was used
+ *	rm                  - if -r rm was used and rm != NULL set *rm to path
  */
 void
 find_utils(bool tar_flag_used, char **tar, bool ls_flag_used,
 	   char **ls, bool txzchk_flag_used, char **txzchk, bool fnamchk_flag_used, char **fnamchk,
-	   bool chkentry_flag_used, char **chkentry, bool make_flag_used, char **make)
+	   bool chkentry_flag_used, char **chkentry, bool make_flag_used, char **make,
+           bool rm_flag_used, char **rm)
 {
     /*
      * guess where tar and ls utilities are located
@@ -144,7 +147,10 @@ find_utils(bool tar_flag_used, char **tar, bool ls_flag_used,
 	*make = MAKE_PATH_1;
 	dbg(DBG_MED, "using default make path: %s", MAKE_PATH_1);
     }
-
+    if (rm != NULL && !rm_flag_used && !is_exec(RM_PATH_0) && is_exec(RM_PATH_1)) {
+	*rm = RM_PATH_1;
+	dbg(DBG_MED, "using default rm path: %s", RM_PATH_1);
+    }
 
     return;
 }

soup/sanity.c

@@ -75,8 +75,7 @@
 extern void ioccc_sanity_chks(void); /* all *_sanity_chks() functions should call this */
 extern void find_utils(bool tar_flag_used, char **tar, bool ls_flag_used,
 	   char **ls, bool txzchk_flag_used, char **txzchk, bool fnamchk_flag_used, char **fnamchk,
-	   bool chkentry_flag_used, char **chkentry, bool make_flag_used, char **make);
-
-
+	   bool chkentry_flag_used, char **chkentry, bool make_flag_used, char **make, bool rm_flag_used,
+           char **rm);
 
 #endif /* INCLUDE_SANITY_H */

soup/sanity.h

@@ -116,6 +116,8 @@
 #define JPARSE_PATH_1 "/usr/local/bin/jparse"	    /* default path to jparse tool if installed */
 #define MAKE_PATH_0 "/usr/bin/make"                 /* default path to make tool */
 #define MAKE_PATH_1 "/bin/make"                     /* in case /usr/bin/make doesn't work */
+#define RM_PATH_0 "/bin/rm"                         /* default path to rm tool */
+#define RM_PATH_1 "/usr/bin/rm"                     /* in case /bin/rm doesn't work */
 
 
 /*

soup/soup.h

@@ -279,10 +279,10 @@ main(int argc, char **argv)
 
     if (!read_from_text_file) {
 	find_utils(tar_flag_used, &tar, false, NULL, false, NULL,
-		   fnamchk_flag_used, &fnamchk, false, NULL, false, NULL);
+		   fnamchk_flag_used, &fnamchk, false, NULL, false, NULL, false, NULL);
     } else {
 	find_utils(false, NULL, false, NULL, false, NULL,
-		   fnamchk_flag_used, &fnamchk, false, NULL, false, NULL);
+		   fnamchk_flag_used, &fnamchk, false, NULL, false, NULL, false, NULL);
     }
 
     /* additional sanity checks */