diff options
Diffstat (limited to 'net/netatalk-asun/patches/patch-aj')
| -rw-r--r-- | net/netatalk-asun/patches/patch-aj | 71 |
1 files changed, 11 insertions, 60 deletions
diff --git a/net/netatalk-asun/patches/patch-aj b/net/netatalk-asun/patches/patch-aj index 2ae3aa4cb2f..7adc9ab847c 100644 --- a/net/netatalk-asun/patches/patch-aj +++ b/net/netatalk-asun/patches/patch-aj @@ -1,61 +1,12 @@ -$NetBSD: patch-aj,v 1.2 2000/07/31 18:33:49 abs Exp $ +$NetBSD: patch-aj,v 1.3 2000/08/15 14:48:23 abs Exp $ ---- etc/papd/printcap.c.orig Fri May 30 01:27:35 1997 -+++ etc/papd/printcap.c Mon Jul 31 18:55:05 2000 -@@ -158,6 +158,7 @@ - register int i = 0, cnt = 0; - char ibuf[BUFSIZ]; - int tf; -+ int skip; - - hopcount = 0; - tbuf = bp; -@@ -176,7 +177,7 @@ - cp2 = getenv("TERM"); - if (cp2==(char *) 0 || strcmp(name,cp2)==0) { - strcpy(bp,cp); -- return(tnchktc()); -+ return(tnchktc(cap)); - } else { - tf = open(cap, 0); - } -@@ -190,6 +191,7 @@ - #endif - if (tf < 0) - return (-1); -+ skip = 0; - for (;;) { - cp = bp; - for (;;) { -@@ -203,12 +205,20 @@ - } - c = ibuf[i++]; - if (c == '\n') { -- if (cp > bp && cp[-1] == '\\'){ -+ if (!skip && cp > bp && cp[-1] == '\\'){ - cp--; - continue; - } -- break; -+ skip = 0; -+ if (cp == bp) -+ continue; -+ else -+ break; - } -+ if (c == '#' && cp == bp) -+ skip++; -+ if (skip) -+ continue; - if (cp >= bp+BUFSIZ) { - write(2,"Termcap entry too long\n", 23); - break; -@@ -222,7 +232,7 @@ - */ - if (tnamatch(name)) { - close(tf); -- return(tnchktc()); -+ return(tnchktc(cap)); - } - } - } +--- etc/papd/Makefile.orig Tue May 20 18:35:42 1997 ++++ etc/papd/Makefile +@@ -20,6 +20,7 @@ + fi; \ + ${MAKE} ${MFLAGS} CC="${CC}" ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" \ + OPTOPTS="${OPTOPTS}" DESTDIR="${DESTDIR}" \ ++ LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \ + SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \ + ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \ + KRBLIBS="$${KRBLIBS}" KRBLIBDIRS="$${KRBLIBDIRS}" \ |