diff options
| author | joerg <joerg@pkgsrc.org> | 2013-01-11 13:31:05 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2013-01-11 13:31:05 +0000 |
| commit | 57d645c30ce0ff0a5fcccec82ee6f07a0855f8a4 (patch) | |
| tree | 61df256eece9e7d41c58517e21380621ead2a933 /sysutils | |
| parent | 232702027a247eabf92b74158f688629549e082b (diff) | |
| download | pkgsrc-57d645c30ce0ff0a5fcccec82ee6f07a0855f8a4.tar.gz | |
Avoid conflict with log(3).
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/gpart/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/gpart/patches/patch-ab | 69 |
2 files changed, 68 insertions, 5 deletions
diff --git a/sysutils/gpart/distinfo b/sysutils/gpart/distinfo index 18075874468..2d4dcbd845c 100644 --- a/sysutils/gpart/distinfo +++ b/sysutils/gpart/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.8 2010/02/04 21:14:02 heinz Exp $ +$NetBSD: distinfo,v 1.9 2013/01/11 13:31:05 joerg Exp $ SHA1 (gpart-0.1h.tar.gz) = 23f66162e1d85977ea43bfe6b5e5bff0ad2d566e RMD160 (gpart-0.1h.tar.gz) = 1cdfb1779801ee8755b05975ced24441a3a2b639 Size (gpart-0.1h.tar.gz) = 52352 bytes SHA1 (patch-aa) = f971cc7ae0efbacd64e8f5e6bf9c2496f75320a3 -SHA1 (patch-ab) = 43fda85fe6b11c00b256682c7184578a985b9397 +SHA1 (patch-ab) = 557f146fcd40f2fa501eb2cff006966efa95b087 SHA1 (patch-ac) = 15a57dd0e9b57c7a64869b43df37a5b2493e77d2 SHA1 (patch-ad) = e53ca24886c072d514802e7dca7a79da2e1916d0 SHA1 (patch-ae) = d02258c0a702156a6be9370f4b60c59a1109afeb diff --git a/sysutils/gpart/patches/patch-ab b/sysutils/gpart/patches/patch-ab index 7a990e2e8f4..79ea22f40f7 100644 --- a/sysutils/gpart/patches/patch-ab +++ b/sysutils/gpart/patches/patch-ab @@ -1,7 +1,50 @@ -$NetBSD: patch-ab,v 1.4 2008/12/26 20:23:45 hasso Exp $ +$NetBSD: patch-ab,v 1.5 2013/01/11 13:31:06 joerg Exp $ ---- src/gpart.c.orig 2001-02-07 20:08:08 +0200 -+++ src/gpart.c 2008-12-25 21:31:22 +0200 +--- src/gpart.c.orig 2001-02-07 18:08:08.000000000 +0000 ++++ src/gpart.c +@@ -69,7 +69,7 @@ int f_skiperrors = 1, berrno = 0; + int (*boundary_fun)(disk_desc *,s64_t); + unsigned long increment = 'h', gc = 0, gh = 0, gs = 0; + s64_t skipsec = 0, maxsec = 0; +-FILE *log = 0; ++FILE *logfile = 0; + + + +@@ -125,26 +125,26 @@ void pr(int type,char *fmt,...) + case FATAL : + g_mod_deleteall(); + if (! f_quiet) fprintf(stderr,EM_FATALERROR,msg); +- if (log) ++ if (logfile) + { +- fprintf(log,EM_FATALERROR,msg); +- fclose(log); ++ fprintf(logfile,EM_FATALERROR,msg); ++ fclose(logfile); + } + exit(1); + case ERROR : + if (! f_quiet) fprintf(stderr,EM_SIMPLEERROR,msg); +- if (log) fprintf(log,EM_SIMPLEERROR,msg); ++ if (logfile) fprintf(logfile,EM_SIMPLEERROR,msg); + break; + case WARN : + if (! f_quiet) fprintf(stderr,EM_WARNING,msg); +- if (log) fprintf(log,EM_WARNING,msg); ++ if (logfile) fprintf(logfile,EM_WARNING,msg); + break; + case MSG : + if (! f_quiet) fputs(msg,stdout); fflush(stdout); +- if (log) fputs(msg,log); ++ if (logfile) fputs(msg,logfile); + break; + } +- if (log) fflush(log); ++ if (logfile) fflush(logfile); + } + + @@ -300,9 +300,10 @@ static char *get_part_type(int type) { 0x8E, "Linux LVM physical volume" }, { 0x93, "Amoeba filesystem" }, @@ -14,3 +57,23 @@ $NetBSD: patch-ab,v 1.4 2008/12/26 20:23:45 hasso Exp $ { 0xB7, "BSDI BSD/386 filesystem" }, { 0xB8, "BSDI BSD/386 swap" }, { 0xC7, "Syrinx" }, +@@ -1750,8 +1751,8 @@ int main(int ac,char **av) + } + break; + case 'l' : +- if (log) fclose(log); +- if ((log = fopen(optarg,"w")) == 0) ++ if (logfile) fclose(logfile); ++ if ((logfile = fopen(optarg,"w")) == 0) + pr(FATAL,EM_OPENLOG,optarg); + break; + case 'L' : +@@ -1831,7 +1832,7 @@ int main(int ac,char **av) + } + } + free_disk_desc(d); +- if (log) fclose(log); ++ if (logfile) fclose(logfile); + + return (f_check ? no_of_incons : 0); + } |