=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/patch/patch.c,v retrieving revision 1.7 retrieving revision 1.8 diff -c -r1.7 -r1.8 *** src/usr.bin/patch/patch.c 1996/09/24 02:58:52 1.7 --- src/usr.bin/patch/patch.c 1996/09/24 04:19:28 1.8 *************** *** 1,4 **** ! /* $OpenBSD: patch.c,v 1.7 1996/09/24 02:58:52 millert Exp $ */ /* patch - a program to apply diffs to original files * --- 1,4 ---- ! /* $OpenBSD: patch.c,v 1.8 1996/09/24 04:19:28 millert Exp $ */ /* patch - a program to apply diffs to original files * *************** *** 9,15 **** */ #ifndef lint ! static char rcsid[] = "$OpenBSD: patch.c,v 1.7 1996/09/24 02:58:52 millert Exp $"; #endif /* not lint */ #include "INTERN.h" --- 9,15 ---- */ #ifndef lint ! static char rcsid[] = "$OpenBSD: patch.c,v 1.8 1996/09/24 04:19:28 millert Exp $"; #endif /* not lint */ #include "INTERN.h" *************** *** 81,108 **** TMPOUTNAME = (char *) malloc (tmpname_len); strcpy (TMPOUTNAME, tmpdir); strcat (TMPOUTNAME, "/patchoXXXXXX"); ! if ((i = Mkstemp(TMPOUTNAME)) < 0) pfatal2("can't create %s", TMPOUTNAME); Close(i); TMPINNAME = (char *) malloc (tmpname_len); strcpy (TMPINNAME, tmpdir); strcat (TMPINNAME, "/patchiXXXXXX"); ! if ((i = Mkstemp(TMPINNAME)) < 0) pfatal2("can't create %s", TMPINNAME); Close(i); TMPREJNAME = (char *) malloc (tmpname_len); strcpy (TMPREJNAME, tmpdir); strcat (TMPREJNAME, "/patchrXXXXXX"); ! if ((i = Mkstemp(TMPREJNAME)) < 0) pfatal2("can't create %s", TMPREJNAME); Close(i); TMPPATNAME = (char *) malloc (tmpname_len); strcpy (TMPPATNAME, tmpdir); strcat (TMPPATNAME, "/patchpXXXXXX"); ! if ((i = Mkstemp(TMPPATNAME)) < 0) pfatal2("can't create %s", TMPPATNAME); Close(i); } --- 81,108 ---- TMPOUTNAME = (char *) malloc (tmpname_len); strcpy (TMPOUTNAME, tmpdir); strcat (TMPOUTNAME, "/patchoXXXXXX"); ! if ((i = mkstemp(TMPOUTNAME)) < 0) pfatal2("can't create %s", TMPOUTNAME); Close(i); TMPINNAME = (char *) malloc (tmpname_len); strcpy (TMPINNAME, tmpdir); strcat (TMPINNAME, "/patchiXXXXXX"); ! if ((i = mkstemp(TMPINNAME)) < 0) pfatal2("can't create %s", TMPINNAME); Close(i); TMPREJNAME = (char *) malloc (tmpname_len); strcpy (TMPREJNAME, tmpdir); strcat (TMPREJNAME, "/patchrXXXXXX"); ! if ((i = mkstemp(TMPREJNAME)) < 0) pfatal2("can't create %s", TMPREJNAME); Close(i); TMPPATNAME = (char *) malloc (tmpname_len); strcpy (TMPPATNAME, tmpdir); strcat (TMPPATNAME, "/patchpXXXXXX"); ! if ((i = mkstemp(TMPPATNAME)) < 0) pfatal2("can't create %s", TMPPATNAME); Close(i); } *************** *** 488,496 **** s = nextarg(); if (!isalpha(*s) && '_' != *s) fatal1("argument to -D is not an identifier\n"); ! Sprintf(if_defined, "#ifdef %s\n", s); ! Sprintf(not_defined, "#ifndef %s\n", s); ! Sprintf(end_defined, "#endif /* %s */\n", s); break; case 'e': diff_type = ED_DIFF; --- 488,496 ---- s = nextarg(); if (!isalpha(*s) && '_' != *s) fatal1("argument to -D is not an identifier\n"); ! Snprintf(if_defined, sizeof if_defined, "#ifdef %s\n", s); ! Snprintf(not_defined, sizeof not_defined, "#ifndef %s\n", s); ! Snprintf(end_defined, sizeof end_defined, "#endif /* %s */\n", s); break; case 'e': diff_type = ED_DIFF;