diff options
| author | roberto <roberto@FreeBSD.org> | 2002-08-12 23:57:49 +0800 |
|---|---|---|
| committer | roberto <roberto@FreeBSD.org> | 2002-08-12 23:57:49 +0800 |
| commit | 31a46f6bdbd2dd4539936eab1a6a0dea9ec279d4 (patch) | |
| tree | 61a98af4f33123cd51b518086a1c338557a43f41 /devel | |
| parent | a061655fbb8c1c819bbba04d4a13b258837aa2eb (diff) | |
| download | freebsd-ports-gnome-31a46f6bdbd2dd4539936eab1a6a0dea9ec279d4.tar.gz freebsd-ports-gnome-31a46f6bdbd2dd4539936eab1a6a0dea9ec279d4.tar.zst freebsd-ports-gnome-31a46f6bdbd2dd4539936eab1a6a0dea9ec279d4.zip | |
Patch up the getopt code to work around a crash when no long name is
present. This has already been committed upstream, and adding it as
a patch is just a temporary fix to keep subversion from segfaulting
when you do 'svn --version' until I have a chance to update the port
to a newer version of apr.
Submitted by: Garrett Rooney <rooneg@electricjellyfish.net> (MAINTAINER)
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/apr/files/patch-apr-misc-unix-getopt.c | 15 | ||||
| -rw-r--r-- | devel/apr0/files/patch-apr-misc-unix-getopt.c | 15 | ||||
| -rw-r--r-- | devel/apr1/files/patch-apr-misc-unix-getopt.c | 15 | ||||
| -rw-r--r-- | devel/apr2/files/patch-apr-misc-unix-getopt.c | 15 |
4 files changed, 60 insertions, 0 deletions
diff --git a/devel/apr/files/patch-apr-misc-unix-getopt.c b/devel/apr/files/patch-apr-misc-unix-getopt.c new file mode 100644 index 000000000000..2634000a14cd --- /dev/null +++ b/devel/apr/files/patch-apr-misc-unix-getopt.c @@ -0,0 +1,15 @@ +--- apr/misc/unix/getopt.c.orig Thu Nov 29 06:19:51 2001 ++++ apr/misc/unix/getopt.c Sun Aug 11 11:29:01 2002 +@@ -237,10 +237,12 @@ + for (i = 0; ; i++) { + if (opts[i].optch == 0) /* No match */ + return serr(os, "invalid option", p - 2, APR_BADCH); ++ if (opts[i].name) { + len = strlen(opts[i].name); + if (strncmp(p, opts[i].name, len) == 0 + && (p[len] == '\0' || p[len] == '=')) + break; ++ } + } + *optch = opts[i].optch; + diff --git a/devel/apr0/files/patch-apr-misc-unix-getopt.c b/devel/apr0/files/patch-apr-misc-unix-getopt.c new file mode 100644 index 000000000000..2634000a14cd --- /dev/null +++ b/devel/apr0/files/patch-apr-misc-unix-getopt.c @@ -0,0 +1,15 @@ +--- apr/misc/unix/getopt.c.orig Thu Nov 29 06:19:51 2001 ++++ apr/misc/unix/getopt.c Sun Aug 11 11:29:01 2002 +@@ -237,10 +237,12 @@ + for (i = 0; ; i++) { + if (opts[i].optch == 0) /* No match */ + return serr(os, "invalid option", p - 2, APR_BADCH); ++ if (opts[i].name) { + len = strlen(opts[i].name); + if (strncmp(p, opts[i].name, len) == 0 + && (p[len] == '\0' || p[len] == '=')) + break; ++ } + } + *optch = opts[i].optch; + diff --git a/devel/apr1/files/patch-apr-misc-unix-getopt.c b/devel/apr1/files/patch-apr-misc-unix-getopt.c new file mode 100644 index 000000000000..2634000a14cd --- /dev/null +++ b/devel/apr1/files/patch-apr-misc-unix-getopt.c @@ -0,0 +1,15 @@ +--- apr/misc/unix/getopt.c.orig Thu Nov 29 06:19:51 2001 ++++ apr/misc/unix/getopt.c Sun Aug 11 11:29:01 2002 +@@ -237,10 +237,12 @@ + for (i = 0; ; i++) { + if (opts[i].optch == 0) /* No match */ + return serr(os, "invalid option", p - 2, APR_BADCH); ++ if (opts[i].name) { + len = strlen(opts[i].name); + if (strncmp(p, opts[i].name, len) == 0 + && (p[len] == '\0' || p[len] == '=')) + break; ++ } + } + *optch = opts[i].optch; + diff --git a/devel/apr2/files/patch-apr-misc-unix-getopt.c b/devel/apr2/files/patch-apr-misc-unix-getopt.c new file mode 100644 index 000000000000..2634000a14cd --- /dev/null +++ b/devel/apr2/files/patch-apr-misc-unix-getopt.c @@ -0,0 +1,15 @@ +--- apr/misc/unix/getopt.c.orig Thu Nov 29 06:19:51 2001 ++++ apr/misc/unix/getopt.c Sun Aug 11 11:29:01 2002 +@@ -237,10 +237,12 @@ + for (i = 0; ; i++) { + if (opts[i].optch == 0) /* No match */ + return serr(os, "invalid option", p - 2, APR_BADCH); ++ if (opts[i].name) { + len = strlen(opts[i].name); + if (strncmp(p, opts[i].name, len) == 0 + && (p[len] == '\0' || p[len] == '=')) + break; ++ } + } + *optch = opts[i].optch; + |