=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/awk/main.c,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- src/usr.bin/awk/main.c 2023/10/06 22:29:24 1.63 +++ src/usr.bin/awk/main.c 2023/10/31 01:08:51 1.64 @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.63 2023/10/06 22:29:24 millert Exp $ */ +/* $OpenBSD: main.c,v 1.64 2023/10/31 01:08:51 millert Exp $ */ /**************************************************************** Copyright (C) Lucent Technologies 1997 All Rights Reserved @@ -23,7 +23,7 @@ THIS SOFTWARE. ****************************************************************/ -const char *version = "version 20231001"; +const char *version = "version 20231030"; #define DEBUG #include @@ -35,9 +35,9 @@ #include #include "awk.h" +extern char *__progname; extern char **environ; extern int nfields; -extern char *__progname; int dbg = 0; Awkfloat srand_seed = 1; @@ -138,8 +138,8 @@ setlocale(LC_CTYPE, ""); setlocale(LC_NUMERIC, "C"); /* for parsing cmdline & prog */ awk_mb_cur_max = MB_CUR_MAX; - cmdname = __progname; + if (pledge("stdio rpath wpath cpath proc exec", NULL) == -1) { fprintf(stderr, "%s: pledge: incorrect arguments\n", cmdname); @@ -149,9 +149,8 @@ if (argc == 1) { fprintf(stderr, "usage: %s [-safe] [-V] [-d[n]] " "[-f fs | --csv] [-v var=value]\n" - "\t [prog | -f progfile] file ...\n", - cmdname); - exit(1); + "\t [prog | -f progfile] file ...\n", cmdname); + return 1; } #ifdef SA_SIGINFO { @@ -216,7 +215,7 @@ dbg = 1; printf("awk %s\n", version); break; - case 'V': /* added for exptools "standard" */ + case 'V': printf("awk %s\n", version); return 0; default: