From 47ffa307076429d98df590061b64c9d5ff7af34c Mon Sep 17 00:00:00 2001 From: Ollivier Robert Date: Mon, 12 Aug 2002 15:57:49 +0000 Subject: 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 (MAINTAINER) --- devel/apr/files/patch-apr-misc-unix-getopt.c | 15 +++++++++++++++ devel/apr0/files/patch-apr-misc-unix-getopt.c | 15 +++++++++++++++ devel/apr1/files/patch-apr-misc-unix-getopt.c | 15 +++++++++++++++ devel/apr2/files/patch-apr-misc-unix-getopt.c | 15 +++++++++++++++ 4 files changed, 60 insertions(+) create mode 100644 devel/apr/files/patch-apr-misc-unix-getopt.c create mode 100644 devel/apr0/files/patch-apr-misc-unix-getopt.c create mode 100644 devel/apr1/files/patch-apr-misc-unix-getopt.c create mode 100644 devel/apr2/files/patch-apr-misc-unix-getopt.c (limited to 'devel') 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; + -- cgit v1.2.3