[PATCH] STDCXX-401 test suite should honor TMPDIR
|
View:
New views
6 Messages
—
Rating Filter:
Alert me
|
 |
[PATCH] STDCXX-401 test suite should honor TMPDIR
by Scott Zhong-2
::
Rate this Message:
Index: file.cpp
=================================================================== --- file.cpp (revision 702657) +++ file.cpp (working copy) @@ -208,8 +208,10 @@ #ifndef _RWSTD_NO_MKSTEMP # define TMP_TEMPLATE "tmpfile-XXXXXX" + char *tmpdir = getenv ("TMPDIR") == NULL ? P_tmpdir : getenv ("TMPDIR"); + if (!buf) { - static char fname_buf [sizeof (P_tmpdir) + sizeof (TMP_TEMPLATE)]; + static char fname_buf [sizeof (tmpdir) + sizeof (TMP_TEMPLATE)]; buf = fname_buf; *buf = '\0'; @@ -217,13 +219,13 @@ if ('\0' == *buf) { // copy the template to the buffer; make sure there is exactly - // one path separator character between P_tmpdir and the file + // one path separator character between tmpdir and the file // name template (it doesn't really matter how many there are // as long as it's at least one, but one looks better than two // in diagnostic messages) - size_t len = sizeof (P_tmpdir) - 1; + size_t len = sizeof (tmpdir) - 1; - memcpy (buf, P_tmpdir, len); + memcpy (buf, tmpdir, len); if (_RWSTD_PATH_SEP != buf [len - 1]) buf [len++] = _RWSTD_PATH_SEP; @@ -251,7 +253,7 @@ # ifdef _WIN32 // create a temporary file name - char* fname = tempnam (P_tmpdir, ".rwtest-tmp"); + char* fname = tempnam (tmpdir, ".rwtest-tmp"); if (fname) { @@ -272,7 +274,7 @@ else { fprintf (stderr, "%s:%d: tempnam(\"%s\", \"%s\") failed: %s\n", __FILE__, __LINE__, - P_tmpdir, ".rwtest-tmp", strerror (errno)); + tmpdir, ".rwtest-tmp", strerror (errno)); } # else |
|
|
RE: [PATCH] STDCXX-401 test suite should honor TMPDIR
by Scott Zhong-2
::
Rate this Message:
this file.cpp is in rwtest under <stdcxx>/tests/src/file.cpp. I have
two more changes coming. > -----Original Message----- > From: Scott Zhong [mailto:Scott.Zhong@...] > Sent: Wednesday, October 08, 2008 9:14 AM > To: dev@... > Subject: [PATCH] STDCXX-401 test suite should honor TMPDIR > > Index: file.cpp > =================================================================== > --- file.cpp (revision 702657) > +++ file.cpp (working copy) > @@ -208,8 +208,10 @@ > #ifndef _RWSTD_NO_MKSTEMP > # define TMP_TEMPLATE "tmpfile-XXXXXX" > > + char *tmpdir = getenv ("TMPDIR") == NULL ? P_tmpdir : getenv > ("TMPDIR"); > + > if (!buf) { > - static char fname_buf [sizeof (P_tmpdir) + sizeof > (TMP_TEMPLATE)]; > + static char fname_buf [sizeof (tmpdir) + sizeof > (TMP_TEMPLATE)]; > > buf = fname_buf; > *buf = '\0'; > @@ -217,13 +219,13 @@ > > if ('\0' == *buf) { > // copy the template to the buffer; make sure there is > - // one path separator character between P_tmpdir and the file > + // one path separator character between tmpdir and the file > // name template (it doesn't really matter how many there are > // as long as it's at least one, but one looks better than two > // in diagnostic messages) > - size_t len = sizeof (P_tmpdir) - 1; > + size_t len = sizeof (tmpdir) - 1; > > - memcpy (buf, P_tmpdir, len); > + memcpy (buf, tmpdir, len); > if (_RWSTD_PATH_SEP != buf [len - 1]) > buf [len++] = _RWSTD_PATH_SEP; > > @@ -251,7 +253,7 @@ > # ifdef _WIN32 > > // create a temporary file name > - char* fname = tempnam (P_tmpdir, ".rwtest-tmp"); > + char* fname = tempnam (tmpdir, ".rwtest-tmp"); > > if (fname) { > > @@ -272,7 +274,7 @@ > else { > fprintf (stderr, "%s:%d: tempnam(\"%s\", \"%s\") failed: > __FILE__, __LINE__, > - P_tmpdir, ".rwtest-tmp", strerror (errno)); > + tmpdir, ".rwtest-tmp", strerror (errno)); > } > > # else |
|
|
|
|
|
RE: [PATCH] STDCXX-401 test suite should honor TMPDIR
by Scott Zhong-2
::
Rate this Message:
Hi Farid, thanks for the quick response, here is the new version with
the changes suggested. Index: tests/src/file.cpp =================================================================== --- tests/src/file.cpp (revision 702657) +++ tests/src/file.cpp (working copy) @@ -208,8 +208,13 @@ #ifndef _RWSTD_NO_MKSTEMP # define TMP_TEMPLATE "tmpfile-XXXXXX" + const char *tmpdir = getenv ("TMPDIR"); + if (tmpdir == NULL) { + tmpdir = const_cast<char>(P_tmpdir); + } + if (!buf) { - static char fname_buf [sizeof (P_tmpdir) + sizeof (TMP_TEMPLATE)]; + static char fname_buf [strlen (tmpdir) + sizeof (TMP_TEMPLATE)]; buf = fname_buf; *buf = '\0'; @@ -217,13 +222,13 @@ if ('\0' == *buf) { // copy the template to the buffer; make sure there is exactly - // one path separator character between P_tmpdir and the file + // one path separator character between tmpdir and the file // name template (it doesn't really matter how many there are // as long as it's at least one, but one looks better than two // in diagnostic messages) - size_t len = sizeof (P_tmpdir) - 1; + size_t len = strlen (tmpdir) - 1; - memcpy (buf, P_tmpdir, len); + memcpy (buf, tmpdir, len); if (_RWSTD_PATH_SEP != buf [len - 1]) buf [len++] = _RWSTD_PATH_SEP; @@ -251,7 +256,7 @@ # ifdef _WIN32 // create a temporary file name - char* fname = tempnam (P_tmpdir, ".rwtest-tmp"); + char* fname = tempnam (tmpdir, ".rwtest-tmp"); if (fname) { @@ -272,7 +277,7 @@ else { fprintf (stderr, "%s:%d: tempnam(\"%s\", \"%s\") failed: %s\n", __FILE__, __LINE__, - P_tmpdir, ".rwtest-tmp", strerror (errno)); + tmpdir, ".rwtest-tmp", strerror (errno)); } # else > -----Original Message----- > From: Farid Zaripov [mailto:Farid_Zaripov@...] > Sent: Thursday, October 09, 2008 2:20 AM > To: dev@... > Subject: Re: [PATCH] STDCXX-401 test suite should honor TMPDIR > > Hi Scott. > > > Index: file.cpp > > =================================================================== > > --- file.cpp (revision 702657) > > +++ file.cpp (working copy) > > @@ -208,8 +208,10 @@ > > #ifndef _RWSTD_NO_MKSTEMP > > # define TMP_TEMPLATE "tmpfile-XXXXXX" > > > > + char *tmpdir = getenv ("TMPDIR") == NULL ? P_tmpdir : getenv > ("TMPDIR"); > > tmpdir might be const char*. And why getenv("TMPDIR") is called > > > + > > if (!buf) { > > - static char fname_buf [sizeof (P_tmpdir) + sizeof > (TMP_TEMPLATE)]; > > + static char fname_buf [sizeof (tmpdir) + sizeof > (TMP_TEMPLATE)]; > > Here sizeof (tmpdir) != strlen (tmpdir). I think that using here > PATH_MAX is ok. > > [...] > > - size_t len = sizeof (P_tmpdir) - 1; > > + size_t len = sizeof (tmpdir) - 1; > > Same. > > Farid. |
|
|
RE: [PATCH] STDCXX-401 test suite should honor TMPDIR
by Scott Zhong-2
::
Rate this Message:
That const_cast isn't suppose to be there. Here is the correct version:
Index: tests/src/file.cpp =================================================================== --- tests/src/file.cpp (revision 702657) +++ tests/src/file.cpp (working copy) @@ -208,8 +208,13 @@ #ifndef _RWSTD_NO_MKSTEMP # define TMP_TEMPLATE "tmpfile-XXXXXX" + const char *tmpdir = getenv ("TMPDIR"); + if (tmpdir == NULL) { + tmpdir = P_tmpdir; + } + if (!buf) { - static char fname_buf [sizeof (P_tmpdir) + sizeof (TMP_TEMPLATE)]; + static char fname_buf [strlen (tmpdir) + sizeof (TMP_TEMPLATE)]; buf = fname_buf; *buf = '\0'; @@ -217,13 +222,13 @@ if ('\0' == *buf) { // copy the template to the buffer; make sure there is exactly - // one path separator character between P_tmpdir and the file + // one path separator character between tmpdir and the file // name template (it doesn't really matter how many there are // as long as it's at least one, but one looks better than two // in diagnostic messages) - size_t len = sizeof (P_tmpdir) - 1; + size_t len = strlen (tmpdir) - 1; - memcpy (buf, P_tmpdir, len); + memcpy (buf, tmpdir, len); if (_RWSTD_PATH_SEP != buf [len - 1]) buf [len++] = _RWSTD_PATH_SEP; @@ -251,7 +256,7 @@ # ifdef _WIN32 // create a temporary file name - char* fname = tempnam (P_tmpdir, ".rwtest-tmp"); + char* fname = tempnam (tmpdir, ".rwtest-tmp"); if (fname) { @@ -272,7 +277,7 @@ else { fprintf (stderr, "%s:%d: tempnam(\"%s\", \"%s\") failed: %s\n", __FILE__, __LINE__, - P_tmpdir, ".rwtest-tmp", strerror (errno)); + tmpdir, ".rwtest-tmp", strerror (errno)); } # else > -----Original Message----- > From: Scott Zhong [mailto:Scott.Zhong@...] > Sent: Thursday, October 09, 2008 9:25 AM > To: dev@... > Subject: RE: [PATCH] STDCXX-401 test suite should honor TMPDIR > > Hi Farid, thanks for the quick response, here is the new version with > the changes suggested. > > Index: tests/src/file.cpp > =================================================================== > --- tests/src/file.cpp (revision 702657) > +++ tests/src/file.cpp (working copy) > @@ -208,8 +208,13 @@ > #ifndef _RWSTD_NO_MKSTEMP > # define TMP_TEMPLATE "tmpfile-XXXXXX" > > + const char *tmpdir = getenv ("TMPDIR"); > + if (tmpdir == NULL) { > + tmpdir = const_cast<char>(P_tmpdir); > + } > + > if (!buf) { > - static char fname_buf [sizeof (P_tmpdir) + sizeof > (TMP_TEMPLATE)]; > + static char fname_buf [strlen (tmpdir) + sizeof > (TMP_TEMPLATE)]; > > buf = fname_buf; > *buf = '\0'; > @@ -217,13 +222,13 @@ > > if ('\0' == *buf) { > // copy the template to the buffer; make sure there is > - // one path separator character between P_tmpdir and the file > + // one path separator character between tmpdir and the file > // name template (it doesn't really matter how many there are > // as long as it's at least one, but one looks better than two > // in diagnostic messages) > - size_t len = sizeof (P_tmpdir) - 1; > + size_t len = strlen (tmpdir) - 1; > > - memcpy (buf, P_tmpdir, len); > + memcpy (buf, tmpdir, len); > if (_RWSTD_PATH_SEP != buf [len - 1]) > buf [len++] = _RWSTD_PATH_SEP; > > @@ -251,7 +256,7 @@ > # ifdef _WIN32 > > // create a temporary file name > - char* fname = tempnam (P_tmpdir, ".rwtest-tmp"); > + char* fname = tempnam (tmpdir, ".rwtest-tmp"); > > if (fname) { > > @@ -272,7 +277,7 @@ > else { > fprintf (stderr, "%s:%d: tempnam(\"%s\", \"%s\") failed: > __FILE__, __LINE__, > - P_tmpdir, ".rwtest-tmp", strerror (errno)); > + tmpdir, ".rwtest-tmp", strerror (errno)); > } > > # else > > > -----Original Message----- > > From: Farid Zaripov [mailto:Farid_Zaripov@...] > > Sent: Thursday, October 09, 2008 2:20 AM > > To: dev@... > > Subject: Re: [PATCH] STDCXX-401 test suite should honor TMPDIR > > > > Hi Scott. > > > > > Index: file.cpp > > > > > > --- file.cpp (revision 702657) > > > +++ file.cpp (working copy) > > > @@ -208,8 +208,10 @@ > > > #ifndef _RWSTD_NO_MKSTEMP > > > # define TMP_TEMPLATE "tmpfile-XXXXXX" > > > > > > + char *tmpdir = getenv ("TMPDIR") == NULL ? P_tmpdir : getenv > > ("TMPDIR"); > > > > tmpdir might be const char*. And why getenv("TMPDIR") is called > twice? > > > > > + > > > if (!buf) { > > > - static char fname_buf [sizeof (P_tmpdir) + sizeof > > (TMP_TEMPLATE)]; > > > + static char fname_buf [sizeof (tmpdir) + sizeof > > (TMP_TEMPLATE)]; > > > > Here sizeof (tmpdir) != strlen (tmpdir). I think that using here > > PATH_MAX is ok. > > > > [...] > > > - size_t len = sizeof (P_tmpdir) - 1; > > > + size_t len = sizeof (tmpdir) - 1; > > > > Same. > > > > Farid. |
|
|
RE: [PATCH] STDCXX-401 test suite should honor TMPDIR
by Scott Zhong-2
::
Rate this Message:
We need to use PATH_MAX for the fname_buf array size.
Index: tests/src/file.cpp =================================================================== --- tests/src/file.cpp (revision 702657) +++ tests/src/file.cpp (working copy) @@ -208,8 +208,13 @@ #ifndef _RWSTD_NO_MKSTEMP # define TMP_TEMPLATE "tmpfile-XXXXXX" + const char *tmpdir = getenv ("TMPDIR"); + if (tmpdir == NULL) { + tmpdir = P_tmpdir; + } + if (!buf) { - static char fname_buf [sizeof (P_tmpdir) + sizeof (TMP_TEMPLATE)]; + static char fname_buf [PATH_MAX]; buf = fname_buf; *buf = '\0'; @@ -217,13 +222,13 @@ if ('\0' == *buf) { // copy the template to the buffer; make sure there is exactly - // one path separator character between P_tmpdir and the file + // one path separator character between tmpdir and the file // name template (it doesn't really matter how many there are // as long as it's at least one, but one looks better than two // in diagnostic messages) - size_t len = sizeof (P_tmpdir) - 1; + size_t len = strlen (tmpdir) - 1; - memcpy (buf, P_tmpdir, len); + memcpy (buf, tmpdir, len); if (_RWSTD_PATH_SEP != buf [len - 1]) buf [len++] = _RWSTD_PATH_SEP; @@ -251,7 +256,7 @@ # ifdef _WIN32 // create a temporary file name - char* fname = tempnam (P_tmpdir, ".rwtest-tmp"); + char* fname = tempnam (tmpdir, ".rwtest-tmp"); if (fname) { @@ -272,7 +277,7 @@ else { fprintf (stderr, "%s:%d: tempnam(\"%s\", \"%s\") failed: %s\n", __FILE__, __LINE__, - P_tmpdir, ".rwtest-tmp", strerror (errno)); + tmpdir, ".rwtest-tmp", strerror (errno)); } # else > -----Original Message----- > From: Scott Zhong [mailto:Scott.Zhong@...] > Sent: Thursday, October 09, 2008 9:31 AM > To: dev@... > Subject: RE: [PATCH] STDCXX-401 test suite should honor TMPDIR > > That const_cast isn't suppose to be there. Here is the correct version: > > Index: tests/src/file.cpp > =================================================================== > --- tests/src/file.cpp (revision 702657) > +++ tests/src/file.cpp (working copy) > @@ -208,8 +208,13 @@ > #ifndef _RWSTD_NO_MKSTEMP > # define TMP_TEMPLATE "tmpfile-XXXXXX" > > + const char *tmpdir = getenv ("TMPDIR"); > + if (tmpdir == NULL) { > + tmpdir = P_tmpdir; > + } > + > if (!buf) { > - static char fname_buf [sizeof (P_tmpdir) + sizeof > (TMP_TEMPLATE)]; > + static char fname_buf [strlen (tmpdir) + sizeof > (TMP_TEMPLATE)]; > > buf = fname_buf; > *buf = '\0'; > @@ -217,13 +222,13 @@ > > if ('\0' == *buf) { > // copy the template to the buffer; make sure there is > - // one path separator character between P_tmpdir and the file > + // one path separator character between tmpdir and the file > // name template (it doesn't really matter how many there are > // as long as it's at least one, but one looks better than two > // in diagnostic messages) > - size_t len = sizeof (P_tmpdir) - 1; > + size_t len = strlen (tmpdir) - 1; > > - memcpy (buf, P_tmpdir, len); > + memcpy (buf, tmpdir, len); > if (_RWSTD_PATH_SEP != buf [len - 1]) > buf [len++] = _RWSTD_PATH_SEP; > > @@ -251,7 +256,7 @@ > # ifdef _WIN32 > > // create a temporary file name > - char* fname = tempnam (P_tmpdir, ".rwtest-tmp"); > + char* fname = tempnam (tmpdir, ".rwtest-tmp"); > > if (fname) { > > @@ -272,7 +277,7 @@ > else { > fprintf (stderr, "%s:%d: tempnam(\"%s\", \"%s\") failed: > __FILE__, __LINE__, > - P_tmpdir, ".rwtest-tmp", strerror (errno)); > + tmpdir, ".rwtest-tmp", strerror (errno)); > } > > # else > > > -----Original Message----- > > From: Scott Zhong [mailto:Scott.Zhong@...] > > Sent: Thursday, October 09, 2008 9:25 AM > > To: dev@... > > Subject: RE: [PATCH] STDCXX-401 test suite should honor TMPDIR > > > > Hi Farid, thanks for the quick response, here is the new version > > the changes suggested. > > > > Index: tests/src/file.cpp > > =================================================================== > > --- tests/src/file.cpp (revision 702657) > > +++ tests/src/file.cpp (working copy) > > @@ -208,8 +208,13 @@ > > #ifndef _RWSTD_NO_MKSTEMP > > # define TMP_TEMPLATE "tmpfile-XXXXXX" > > > > + const char *tmpdir = getenv ("TMPDIR"); > > + if (tmpdir == NULL) { > > + tmpdir = const_cast<char>(P_tmpdir); > > + } > > + > > if (!buf) { > > - static char fname_buf [sizeof (P_tmpdir) + sizeof > > (TMP_TEMPLATE)]; > > + static char fname_buf [strlen (tmpdir) + sizeof > > (TMP_TEMPLATE)]; > > > > buf = fname_buf; > > *buf = '\0'; > > @@ -217,13 +222,13 @@ > > > > if ('\0' == *buf) { > > // copy the template to the buffer; make sure there is > exactly > > - // one path separator character between P_tmpdir and the > > + // one path separator character between tmpdir and the file > > // name template (it doesn't really matter how many there are > > // as long as it's at least one, but one looks better than > two > > // in diagnostic messages) > > - size_t len = sizeof (P_tmpdir) - 1; > > + size_t len = strlen (tmpdir) - 1; > > > > - memcpy (buf, P_tmpdir, len); > > + memcpy (buf, tmpdir, len); > > if (_RWSTD_PATH_SEP != buf [len - 1]) > > buf [len++] = _RWSTD_PATH_SEP; > > > > @@ -251,7 +256,7 @@ > > # ifdef _WIN32 > > > > // create a temporary file name > > - char* fname = tempnam (P_tmpdir, ".rwtest-tmp"); > > + char* fname = tempnam (tmpdir, ".rwtest-tmp"); > > > > if (fname) { > > > > @@ -272,7 +277,7 @@ > > else { > > fprintf (stderr, "%s:%d: tempnam(\"%s\", \"%s\") failed: > %s\n", > > __FILE__, __LINE__, > > - P_tmpdir, ".rwtest-tmp", strerror (errno)); > > + tmpdir, ".rwtest-tmp", strerror (errno)); > > } > > > > # else > > > > > -----Original Message----- > > > From: Farid Zaripov [mailto:Farid_Zaripov@...] > > > Sent: Thursday, October 09, 2008 2:20 AM > > > To: dev@... > > > Subject: Re: [PATCH] STDCXX-401 test suite should honor TMPDIR > > > > > > Hi Scott. > > > > > > > Index: file.cpp > > > > > =================================================================== > > > > --- file.cpp (revision 702657) > > > > +++ file.cpp (working copy) > > > > @@ -208,8 +208,10 @@ > > > > #ifndef _RWSTD_NO_MKSTEMP > > > > # define TMP_TEMPLATE "tmpfile-XXXXXX" > > > > > > > > + char *tmpdir = getenv ("TMPDIR") == NULL ? P_tmpdir : > > > ("TMPDIR"); > > > > > > tmpdir might be const char*. And why getenv("TMPDIR") is called > > twice? > > > > > > > + > > > > if (!buf) { > > > > - static char fname_buf [sizeof (P_tmpdir) + sizeof > > > (TMP_TEMPLATE)]; > > > > + static char fname_buf [sizeof (tmpdir) + sizeof > > > (TMP_TEMPLATE)]; > > > > > > Here sizeof (tmpdir) != strlen (tmpdir). I think that using here > > > PATH_MAX is ok. > > > > > > [...] > > > > - size_t len = sizeof (P_tmpdir) - 1; > > > > + size_t len = sizeof (tmpdir) - 1; > > > > > > Same. > > > > > > Farid. |
| Free embeddable forum powered by Nabble | Forum Help |
