diff options
| author | obache <obache> | 2010-01-09 11:50:36 +0000 |
|---|---|---|
| committer | obache <obache> | 2010-01-09 11:50:36 +0000 |
| commit | 5ce7ce899471af94f80f7eb0ba46c9e0685ef972 (patch) | |
| tree | 54958be83308457977437f7bdd14fe4f59d6701f /inputmethod/kinput2 | |
| parent | 1fadb549db270022e2b20d73897cb28eb928ecbe (diff) | |
| download | pkgsrc-5ce7ce899471af94f80f7eb0ba46c9e0685ef972.tar.gz | |
Add patch-ac to avoid conflict with getline(3) in IEEE Std 1003.1-2008.
PR#42595.
Diffstat (limited to 'inputmethod/kinput2')
| -rw-r--r-- | inputmethod/kinput2/distinfo | 3 | ||||
| -rw-r--r-- | inputmethod/kinput2/patches/patch-ac | 44 |
2 files changed, 46 insertions, 1 deletions
diff --git a/inputmethod/kinput2/distinfo b/inputmethod/kinput2/distinfo index 03639ce3d9d..cbd39d2e3c9 100644 --- a/inputmethod/kinput2/distinfo +++ b/inputmethod/kinput2/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.3 2005/02/23 21:00:35 agc Exp $ +$NetBSD: distinfo,v 1.4 2010/01/09 11:50:36 obache Exp $ SHA1 (kinput2-v3.tar.gz) = a9e2be1fe4da4c5f4921a1d753f58d20f1ef3693 RMD160 (kinput2-v3.tar.gz) = 8c8a72a693edc52882be392ef91e7ad9a5c2a7e6 Size (kinput2-v3.tar.gz) = 462281 bytes SHA1 (patch-aa) = c41b2baa5de117c031c266afbff0e947340ab708 SHA1 (patch-ab) = b2372ee1f50cc828eae4e8c6ca6d7bc6de11964b +SHA1 (patch-ac) = 318e4fd8404bc19080f6879a2895ba36aca89c15 diff --git a/inputmethod/kinput2/patches/patch-ac b/inputmethod/kinput2/patches/patch-ac new file mode 100644 index 00000000000..bc0e2bcf5a1 --- /dev/null +++ b/inputmethod/kinput2/patches/patch-ac @@ -0,0 +1,44 @@ +$NetBSD: patch-ac,v 1.1 2010/01/09 11:50:36 obache Exp $ + +Avoid to conflict with getline(3) in IEEE Std 1003.1-2008. + +--- lib/cconv.c.orig 1999-05-26 23:55:25.000000000 +0000 ++++ lib/cconv.c +@@ -767,7 +767,7 @@ static wchar *promptsave(wchar *); + static int parseLine(uchar *, uchar **, int); + static FILE *openfile(char *); + static int doinclude(uchar *, Files *, void (*)()); +-static uchar *getline(uchar *, int, Files *, void (*)()); ++static uchar *get_line(uchar *, int, Files *, void (*)()); + static int readRuleFile(ccRule, char *); + static int registMode(ccRule, int, uchar **); + static int newMode(ccRule, Files *, _strbufRec *, _funcbufRec *, +@@ -1012,8 +1012,8 @@ void (*efunc)(); + return 0; + } + +-/* getline -- 1$B9TFI$_9~$`(B ($B$=$N:](B include $B$N=hM}$r9T$J$&(B) */ +-static uchar *getline(line, linesize, files, efunc) ++/* get_line -- 1$B9TFI$_9~$`(B ($B$=$N:](B include $B$N=hM}$r9T$J$&(B) */ ++static uchar *get_line(line, linesize, files, efunc) + uchar *line; + int linesize; + Files *files; +@@ -1077,7 +1077,7 @@ char *file; + rule->nmode = 0; + rule->initialmode = -1; + +- while (getline(line, sizeof(line), &files, efunc)) { ++ while (get_line(line, sizeof(line), &files, efunc)) { + (void)Strcpy(tmp, line); + if ((argc = parseLine(tmp, argv, 20)) == 0) + continue; +@@ -1246,7 +1246,7 @@ uchar **av; + cdbuf.cdbuf = NULL; + + /* $B%k!<%k$rFI$s$G%9%H%"$9$k(B */ +- while (getline(line, sizeof(line), files, efunc)) { ++ while (get_line(line, sizeof(line), files, efunc)) { + /* '#' $B$G;O$^$k9T$O%3%a%s%H(B */ + if (*line == '\0' || *line == '\n' || *line == '#') + continue; |