nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

basename() for util/*.c

Browse Source 
Update dlb_main to use the revised vms_basename() for #if VMS in
case it issues a usage message.

Change recover to use similar setup, but the vms-specific bit is
commented out because I'm not sure whether the necessary routine
is being linked with it.
This commit is contained in:
PatR
2023-06-23 12:10:38 -07:00
parent 0616a83ef8
commit ef534e053d
2 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/dlb_main.c
+5 -3
View File
@@ -1,4 +1,4 @@
/* NetHack 3.7 dlb_main.c $NHDT-Date: 1629969943 2021/08/26 09:25:43 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.18 $ */ /* NetHack 3.7 dlb_main.c $NHDT-Date: 1687547434 2023/06/23 19:10:34 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.24 $ */
/* Copyright (c) Kenneth Lorber, Bethesda, Maryland, 1993. */ /* Copyright (c) Kenneth Lorber, Bethesda, Maryland, 1993. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -168,10 +168,12 @@ main(int argc UNUSED_if_no_DLB, char **argv UNUSED_if_no_DLB)
char action = ' '; char action = ' ';
library lib; library lib;
if (argc > 0 && argv[0] && *argv[0]) if (argc > 0)
progname = argv[0]; progname = argv[0];
if (!progname || !*progname)
progname = default_progname;
#ifdef VMS #ifdef VMS
progname = vms_basename(progname); progname = vms_basename(progname, FALSE);
#endif #endif
if (argc < 2) { if (argc < 2) {
util/recover.c
+14 -7
View File
@@ -1,4 +1,4 @@
/* NetHack 3.7 recover.c $NHDT-Date: 1658093138 2022/07/17 21:25:38 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.31 $ */ /* NetHack 3.7 recover.c $NHDT-Date: 1687547437 2023/06/23 19:10:37 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.33 $ */
/* Copyright (c) Janet Walz, 1992. */ /* Copyright (c) Janet Walz, 1992. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -59,7 +59,7 @@ int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
int argno; int argno;
const char *dir = (char *) 0; const char *dir = (char *) 0, *progname = (char *) 0;
#ifdef AMIGA #ifdef AMIGA
char *startdir = (char *) 0; char *startdir = (char *) 0;
#endif #endif
@@ -72,14 +72,21 @@ main(int argc, char *argv[])
if (!dir) if (!dir)
dir = exepath(argv[0]); dir = exepath(argv[0]);
#endif #endif
if (argc == 1 || (argc == 2 && !strcmp(argv[1], "-"))) { if (argc > 0)
progname = argv[0];
if (!progname || !*progname)
progname = "recover";
#ifdef VMS
/*progname = vms_basebame(progname, FALSE);*/ /* needs vmsfiles.obj */
#endif
if (argc < 2 || (argc == 2 && !strcmp(argv[1], "-"))) {
Fprintf(stderr, "Usage: %s [ -d directory ] base1 [ base2 ... ]\n", Fprintf(stderr, "Usage: %s [ -d directory ] base1 [ base2 ... ]\n",
argv[0]); progname);
#if defined(WIN32) || defined(MSDOS) #if defined(WIN32) || defined(MSDOS)
if (dir) { if (dir) {
Fprintf( Fprintf(stderr,
stderr, "\t(Unless you override it with -d, recover will look \n");
"\t(Unless you override it with -d, recover will look \n");
Fprintf(stderr, "\t in the %s directory on your system)\n", dir); Fprintf(stderr, "\t in the %s directory on your system)\n", dir);
} }
#endif #endif