Skip to content

Commit a59e676

Browse files
committed
patch updates
1 parent 9bbc5e9 commit a59e676

1 file changed

Lines changed: 23 additions & 23 deletions

File tree

patches/repo_gawk.patch

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ index 4891313f7..8cc7aa770 100644
9999
# This is for my development & testing.
100100
efence: gawk
101101
diff --git a/awk.h b/awk.h
102-
index 73531d0a1..7b11d5c74 100644
102+
index fc3bac0ab..83b0f6ba7 100644
103103
--- a/awk.h
104104
+++ b/awk.h
105105
@@ -54,7 +54,7 @@
@@ -123,7 +123,7 @@ index 73531d0a1..7b11d5c74 100644
123123
extern void update_NR(void);
124124
extern void update_NF(void);
125125
extern void update_FNR(void);
126-
@@ -1649,9 +1651,11 @@ extern int isdirpunct(int c);
126+
@@ -1650,9 +1652,11 @@ extern int isdirpunct(int c);
127127
extern void init_sockets(void);
128128
extern void init_io(void);
129129
extern void init_csv_records(void);
@@ -222,7 +222,7 @@ index c8218e932..1105ae4f1 100644
222222
#else /* ! (defined(VMS) || defined(__MINGW32__)) */
223223
pid_t childpid;
224224
diff --git a/configure.ac b/configure.ac
225-
index 9611f1f0f..8999f7d55 100644
225+
index 9048c2245..3ec3175c2 100644
226226
--- a/configure.ac
227227
+++ b/configure.ac
228228
@@ -107,6 +107,8 @@ AC_PROG_EGREP
@@ -254,7 +254,7 @@ index 9611f1f0f..8999f7d55 100644
254254
AM_LANGINFO_CODESET
255255
gt_LC_MESSAGES
256256

257-
@@ -246,50 +248,50 @@ dnl types for the argument to getsockopt, getpeername, etc. So we
257+
@@ -247,50 +249,50 @@ dnl types for the argument to getsockopt, getpeername, etc. So we
258258
dnl have to test to find something that will work.
259259

260260
dnl This is no good, because passing the wrong pointer on C compilers is
@@ -349,7 +349,7 @@ index 9611f1f0f..8999f7d55 100644
349349

350350
dnl Check for C11 _Noreturn
351351
GAWK_AC_NORETURN
352-
@@ -478,10 +480,12 @@ dylib) GAWKLIBEXT=so ;; # MacOS uses .dylib for shared libraries, but libtool us
352+
@@ -480,10 +482,12 @@ dylib) GAWKLIBEXT=so ;; # MacOS uses .dylib for shared libraries, but libtool us
353353
*) GAWKLIBEXT=$acl_shlibext ;;
354354
esac
355355
AC_SUBST(GAWKLIBEXT)
@@ -364,7 +364,7 @@ index 9611f1f0f..8999f7d55 100644
364364
doc/Makefile
365365
extras/Makefile
366366
po/Makefile.in
367-
@@ -509,11 +513,11 @@ w
367+
@@ -511,11 +515,11 @@ w
368368
EOF
369369
done
370370
fi
@@ -413,7 +413,7 @@ index 221250b3b..69a23217d 100644
413413
+#endif
414414
\ No newline at end of file
415415
diff --git a/doc/gawk.texi b/doc/gawk.texi
416-
index b5e1d66a6..de5a8f7e8 100644
416+
index dae97fa0c..95351a127 100644
417417
--- a/doc/gawk.texi
418418
+++ b/doc/gawk.texi
419419
@@ -24177,7 +24177,9 @@ Following is @command{pwcat}, a C program that ``cats'' the password database:
@@ -1039,7 +1039,7 @@ index 1235c7113..de60d379e 100644
10391039
+
10401040
+#endif // _WIN32
10411041
diff --git a/main.c b/main.c
1042-
index 884650dc3..2f07afa73 100644
1042+
index 35546fb35..931806413 100644
10431043
--- a/main.c
10441044
+++ b/main.c
10451045
@@ -33,6 +33,7 @@
@@ -1050,7 +1050,7 @@ index 884650dc3..2f07afa73 100644
10501050

10511051
#define DEFAULT_PROFILE "awkprof.out" /* where to put profile */
10521052
#define DEFAULT_VARFILE "awkvars.out" /* where to put vars */
1053-
@@ -895,7 +896,26 @@ init_vars()
1053+
@@ -881,7 +882,26 @@ init_vars()
10541054
load_procinfo();
10551055
load_environ();
10561056
}
@@ -1078,7 +1078,7 @@ index 884650dc3..2f07afa73 100644
10781078
/* path_environ --- put path variable into environment if not already there */
10791079

10801080
static void
1081-
@@ -918,6 +938,9 @@ path_environ(const char *pname, const char *dflt)
1081+
@@ -904,6 +924,9 @@ path_environ(const char *pname, const char *dflt)
10821082
* If original value was the empty string, set it to
10831083
* the default value.
10841084
*/
@@ -1088,7 +1088,7 @@ index 884650dc3..2f07afa73 100644
10881088
if ((*aptr)->stlen == 0) {
10891089
unref(*aptr);
10901090
*aptr = make_string(val, strlen(val));
1091-
@@ -1058,10 +1081,10 @@ load_procinfo()
1091+
@@ -1044,10 +1067,10 @@ load_procinfo()
10921092
#else
10931093
#define getpgrp_arg() getpid()
10941094
#endif
@@ -1101,7 +1101,7 @@ index 884650dc3..2f07afa73 100644
11011101
/*
11021102
* Could put a lot of this into a table, but then there's
11031103
* portability problems declaring all the functions. So just
1104-
@@ -1070,7 +1093,7 @@ load_procinfo()
1104+
@@ -1056,7 +1079,7 @@ load_procinfo()
11051105

11061106
value = getpid();
11071107
update_PROCINFO_num("pid", value);
@@ -1110,7 +1110,7 @@ index 884650dc3..2f07afa73 100644
11101110
value = getppid();
11111111
update_PROCINFO_num("ppid", value);
11121112

1113-
@@ -1085,7 +1108,7 @@ load_procinfo()
1113+
@@ -1071,7 +1094,7 @@ load_procinfo()
11141114

11151115
value = getegid();
11161116
update_PROCINFO_num("egid", value);
@@ -1665,10 +1665,10 @@ index 000000000..08108b215
16651665
+
16661666
+#endif
16671667
diff --git a/posix/gawkmisc.c b/posix/gawkmisc.c
1668-
index 0b30d7465..60d756385 100644
1668+
index 1656ae96b..4513072cf 100644
16691669
--- a/posix/gawkmisc.c
16701670
+++ b/posix/gawkmisc.c
1671-
@@ -25,6 +25,12 @@
1671+
@@ -26,6 +26,12 @@
16721672
#endif
16731673
#include <io.h> /* for declaration of setmode(). */
16741674
#endif
@@ -1679,9 +1679,9 @@ index 0b30d7465..60d756385 100644
16791679
+#endif // _WIN32
16801680
+#include "filename.h"
16811681

1682-
const char quote = '\'';
1683-
const char *defpath = DEFPATH;
1684-
@@ -44,7 +50,7 @@ gawk_name(const char *filespec)
1682+
#ifdef HAVE_SYS_PERSONALITY_H // for linux
1683+
#include <sys/personality.h>
1684+
@@ -53,7 +59,7 @@ gawk_name(const char *filespec)
16851685
const char *p;
16861686

16871687
/* "path/name" -> "name" */
@@ -1690,7 +1690,7 @@ index 0b30d7465..60d756385 100644
16901690
return (p == NULL ? (char *) filespec : p + 1);
16911691
}
16921692

1693-
@@ -149,7 +155,7 @@ optimal_bufsize(int fd, struct stat *stb)
1693+
@@ -158,7 +164,7 @@ optimal_bufsize(int fd, struct stat *stb)
16941694
int
16951695
ispath(const char *file)
16961696
{
@@ -1699,7 +1699,7 @@ index 0b30d7465..60d756385 100644
16991699
}
17001700

17011701
/* isdirpunct --- return true if char is a directory separator */
1702-
@@ -157,7 +163,7 @@ ispath(const char *file)
1702+
@@ -166,7 +172,7 @@ ispath(const char *file)
17031703
int
17041704
isdirpunct(int c)
17051705
{
@@ -1708,7 +1708,7 @@ index 0b30d7465..60d756385 100644
17081708
}
17091709

17101710
/* os_close_on_exec --- set close on exec flag, print warning if fails */
1711-
@@ -169,7 +175,7 @@ os_close_on_exec(int fd, const char *name, const char *what, const char *dir)
1711+
@@ -178,7 +184,7 @@ os_close_on_exec(int fd, const char *name, const char *what, const char *dir)
17121712

17131713
if (fd <= 2) /* sanity */
17141714
return;
@@ -1717,15 +1717,15 @@ index 0b30d7465..60d756385 100644
17171717
/*
17181718
* Per POSIX, use Read/Modify/Write - get the flags,
17191719
* add FD_CLOEXEC, set the flags back.
1720-
@@ -190,6 +196,7 @@ os_close_on_exec(int fd, const char *name, const char *what, const char *dir)
1720+
@@ -199,6 +205,7 @@ os_close_on_exec(int fd, const char *name, const char *what, const char *dir)
17211721
if (fcntl(fd, F_SETFD, curflags) < 0)
17221722
warning(_("%s %s `%s': could not set close-on-exec: (fcntl F_SETFD: %s)"),
17231723
what, dir, name, strerror(errno));
17241724
+#endif
17251725
}
17261726

17271727
/* os_isdir --- is this an fd on a directory? */
1728-
@@ -240,11 +247,14 @@ int
1728+
@@ -249,11 +256,14 @@ int
17291729
os_is_setuid()
17301730
{
17311731
long uid, euid;

0 commit comments

Comments
 (0)