diff options
| author | Maxim Sobolev <sobomax@FreeBSD.org> | 2000-06-12 16:10:52 +0000 |
|---|---|---|
| committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2000-06-12 16:10:52 +0000 |
| commit | e7d1d4a4a9be97e6d80bfb962613a4d6553e7781 (patch) | |
| tree | 6633c477510811b2efb381b39573646679143fef | |
| parent | 102dab44637f5c358b2284a46b2e8c0021d4ba02 (diff) | |
| download | ports-e7d1d4a4a9be97e6d80bfb962613a4d6553e7781.tar.gz ports-e7d1d4a4a9be97e6d80bfb962613a4d6553e7781.zip | |
Fix a bug in my own tmpnam() --> mkstemp() patch.
Reported by: Pascal Hofstee <daeron@shadowmere.student.utwente.nl>
Notes
Notes:
svn path=/head/; revision=29547
| -rw-r--r-- | devel/libPropList/files/patch-ab | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/devel/libPropList/files/patch-ab b/devel/libPropList/files/patch-ab index 7b31be14b3f7..074161f39fca 100644 --- a/devel/libPropList/files/patch-ab +++ b/devel/libPropList/files/patch-ab @@ -1,21 +1,30 @@ --- filehandling.c.orig Tue Feb 15 03:03:56 2000 -+++ filehandling.c Wed Jun 7 01:03:50 2000 -@@ -464,6 +464,7 @@ ++++ filehandling.c Mon Jun 12 19:07:56 2000 +@@ -458,13 +458,18 @@ + FILE *theFile; + int c; + char *desc = NULL; ++ int fd; + + theRealFileName = PLGetString(PLGetFilename(pl)); + if(!theRealFileName) return NO; if (atomically) { +#ifndef HAVE_MKSTEMP theFileName = tmpnam(NULL); ++#else ++ theFileName = "/var/tmp/tmp.XXXXXX"; ++#endif strcpy(tmp_fileName, theFileName); -@@ -492,14 +493,33 @@ + if((tmp_basename=strtok(tmp_fileName, "/"))) +@@ -492,14 +497,31 @@ } theFileName = strcat(dirname, basename); -+#else /* HAVE_MKSTEMP */ -+ int fd; -+ -+ strcpy(tmp_fileName, "/tmp/tmp.XXXXXX"); ++#ifdef HAVE_MKSTEMP ++ strcpy(tmp_fileName, theFileName); + if ((fd = mkstemp(tmp_fileName)) == -1) + + goto failure; /* Not reached */ |