diff options
| author | pgoyette <pgoyette@pkgsrc.org> | 2009-10-17 18:43:22 +0000 |
|---|---|---|
| committer | pgoyette <pgoyette@pkgsrc.org> | 2009-10-17 18:43:22 +0000 |
| commit | ae944a4866f721ed2730e1951d2ca0b9a8e3e497 (patch) | |
| tree | e453db72d6c456dbe2da32b10f31855022b0438c /print/magicfilter | |
| parent | b9a4c75347dbef1e044ccb06625eb7dae8b2a1f3 (diff) | |
| download | pkgsrc-ae944a4866f721ed2730e1951d2ca0b9a8e3e497.tar.gz | |
Replace local getline() to avoid conflicts with native NetBSD's getline()
OK wiz@
Diffstat (limited to 'print/magicfilter')
| -rw-r--r-- | print/magicfilter/distinfo | 3 | ||||
| -rw-r--r-- | print/magicfilter/patches/patch-ad | 28 |
2 files changed, 30 insertions, 1 deletions
diff --git a/print/magicfilter/distinfo b/print/magicfilter/distinfo index 713882cc489..abe6621d19d 100644 --- a/print/magicfilter/distinfo +++ b/print/magicfilter/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2006/08/31 08:07:00 rillig Exp $ +$NetBSD: distinfo,v 1.6 2009/10/17 18:43:22 pgoyette Exp $ SHA1 (magicfilter-1.2.tar.gz) = f1aff1c38065d9e00e0bfb748b70445829ecc0a6 RMD160 (magicfilter-1.2.tar.gz) = 064aeb611d461664afa5c71d8f8d2edc63480fa2 @@ -6,3 +6,4 @@ Size (magicfilter-1.2.tar.gz) = 53176 bytes SHA1 (patch-aa) = 6fe946d6adc7db746c4ff70ed6a946aebf115d5d SHA1 (patch-ab) = d55a2db4b9048a41be60c51f651ef0dfcb3f315e SHA1 (patch-ac) = eb8aad07704ebe1ab744307523c846827a6afe93 +SHA1 (patch-ad) = 15997d146ce7b64c773e545ba30242ab3ffcd506 diff --git a/print/magicfilter/patches/patch-ad b/print/magicfilter/patches/patch-ad new file mode 100644 index 00000000000..395814cced4 --- /dev/null +++ b/print/magicfilter/patches/patch-ad @@ -0,0 +1,28 @@ +--- loadconfig.c.orig 2009-10-17 07:41:28.000000000 -0700 ++++ loadconfig.c 2009-10-17 07:41:45.000000000 -0700 +@@ -14,14 +14,14 @@ + fclose(f); return NULL; } while(0); + + /* +- * char *getline(FILE *f, char *file, int *lineno) ++ * char *my_getline(FILE *f, char *file, int *lineno) + * + * Get a logical line from file f; returning a pointer to the allocated + * storage. Advance the line pointer by # of lines. file used for + * error messages. + */ + +-static char *getline(FILE *f, char *file, int *line) ++static char *my_getline(FILE *f, char *file, int *line) + { + char *buf, *p; + int buflen, spc, ch, bslash; +@@ -118,7 +118,7 @@ + return NULL; + } + +- while ( (line = getline(f, file, &lineno)) != NULL ) ++ while ( (line = my_getline(f, file, &lineno)) != NULL ) + { + offset = getoffset(line, &p); + |