$NetBSD: patch-ab,v 1.5 2013/01/11 13:31:06 joerg Exp $ --- 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" }, { 0x94, "Amoeba bad block table" }, - { 0xA5, "FreeBSD/NetBSD/386BSD" }, + { 0xA5, "FreeBSD/DragonFly/386BSD or old NetBSD" }, { 0xA6, "OpenBSD" }, { 0xA7, "NEXTSTEP" }, + { 0xA9, "NetBSD" }, { 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); }