diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2016-05-13 19:24:51 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2016-05-13 19:24:51 +0000 |
| commit | f41f6957d4444cf35f4aa63aacbeb03472bb4160 (patch) | |
| tree | defafb258d9c4e6cf2454b950c8207cf060ac60d /japanese/epwutil | |
| parent | 969acbbca18520253432c22696ff3650335f8b26 (diff) | |
| download | ports-f41f6957d4444cf35f4aa63aacbeb03472bb4160.tar.gz ports-f41f6957d4444cf35f4aa63aacbeb03472bb4160.zip | |
Prevent collision with getline(3)
Notes
Notes:
svn path=/head/; revision=415138
Diffstat (limited to 'japanese/epwutil')
| -rw-r--r-- | japanese/epwutil/files/patch-catdump.c | 56 | ||||
| -rw-r--r-- | japanese/epwutil/files/patch-makefile.unx | 4 |
2 files changed, 58 insertions, 2 deletions
diff --git a/japanese/epwutil/files/patch-catdump.c b/japanese/epwutil/files/patch-catdump.c new file mode 100644 index 000000000000..38176b92d3fa --- /dev/null +++ b/japanese/epwutil/files/patch-catdump.c @@ -0,0 +1,56 @@ +--- catdump.c.orig 2016-05-13 19:10:22 UTC ++++ catdump.c +@@ -201,7 +201,7 @@ void outhex(); + void outstr(); + void outjstr(); + int undump(); +-uchr *getline(); ++uchr *get_line(); + uchr *getvalue(); + int gethex(); + int hexdigit(); +@@ -561,7 +561,7 @@ char *txtfile, *catalog; + err = 0; + line = 0; + +- if (getline(buf, fp) == NULL || ++ if (get_line(buf, fp) == NULL || + strncmp(buf, CAT_ENTRY, strlen(CAT_ENTRY))) { + fprintf(stderr, "ERR: 項目 %s がありません\n", CAT_ENTRY); + fclose(fp); +@@ -571,7 +571,7 @@ char *txtfile, *catalog; + st = 0; + hdr = (HDR_T *)catbuf; + mask = 0L; +- while (getline(buf, fp) != NULL && *buf != '[') { ++ while (get_line(buf, fp) != NULL && *buf != '[') { + if ((p = getvalue(buf)) == NULL) { + fprintf(stderr, "ERR: line %d: 構文に誤りがあります\n", line); + err++; +@@ -666,7 +666,7 @@ char *txtfile, *catalog; + if (strncmp(buf, BOOK_ENTRY, strlen(BOOK_ENTRY))) { + fprintf(stderr, "ERR: line %d: 不明な項目です(%s)\n", line, buf); + err++; +- while (getline(buf, fp) != NULL && *buf != '[') ++ while (get_line(buf, fp) != NULL && *buf != '[') + ; + if (*buf == '\0') + break; +@@ -680,7 +680,7 @@ char *txtfile, *catalog; + break; + } + mask = 0; +- while (getline(buf, fp) != NULL && *buf != '[') { ++ while (get_line(buf, fp) != NULL && *buf != '[') { + if ((p = getvalue(buf)) == NULL) { + fprintf(stderr, "ERR: line %d: 構文に誤りがあります\n", line); + err++; +@@ -917,7 +917,7 @@ char *txtfile, *catalog; + } + + uchr * +-getline(buf, fp) ++get_line(buf, fp) + uchr *buf; + FILE *fp; + { diff --git a/japanese/epwutil/files/patch-makefile.unx b/japanese/epwutil/files/patch-makefile.unx index 60a227bbe971..dd5b3bed1e67 100644 --- a/japanese/epwutil/files/patch-makefile.unx +++ b/japanese/epwutil/files/patch-makefile.unx @@ -1,5 +1,5 @@ ---- makefile.unx.orig Wed Oct 22 16:55:42 2003 -+++ makefile.unx Wed Oct 22 16:55:57 2003 +--- makefile.unx.orig 1999-01-12 20:22:02 UTC ++++ makefile.unx @@ -1,7 +1,8 @@ # EPWUTIL Makefile for UNIX/gcc |