git-svn-id: file:///var/lib/svn/clamav-devel/trunk/clamav-devel@1375 77e5149b-7576-45b1-b177-96237e5ba77b
Nigel Horne authored on 2005/03/04 23:21:35... | ... |
@@ -1,3 +1,8 @@ |
1 |
+Fri Mar 4 14:20:22 GMT 2005 (njh) |
|
2 |
+---------------------------------- |
|
3 |
+ * libclamav/blob.c: Fix for QNX version 6 sometimes returning ETOOLONG, |
|
4 |
+ patch from mikep at kaluga.org |
|
5 |
+ |
|
1 | 6 |
Fri Mar 4 03:18:20 CET 2005 (tk) |
2 | 7 |
--------------------------------- |
3 | 8 |
* freshclam/manager.c: additional verbose-mode messages (Stephen Gran) |
... | ... |
@@ -16,6 +16,9 @@ |
16 | 16 |
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
17 | 17 |
* |
18 | 18 |
* $Log: blob.c,v $ |
19 |
+ * Revision 1.36 2005/03/04 14:17:34 nigelhorne |
|
20 |
+ * QNX support |
|
21 |
+ * |
|
19 | 22 |
* Revision 1.35 2005/03/03 09:28:19 nigelhorne |
20 | 23 |
* Tidy |
21 | 24 |
* |
... | ... |
@@ -107,7 +110,7 @@ |
107 | 107 |
* Change LOG to Log |
108 | 108 |
* |
109 | 109 |
*/ |
110 |
-static char const rcsid[] = "$Id: blob.c,v 1.35 2005/03/03 09:28:19 nigelhorne Exp $"; |
|
110 |
+static char const rcsid[] = "$Id: blob.c,v 1.36 2005/03/04 14:17:34 nigelhorne Exp $"; |
|
111 | 111 |
|
112 | 112 |
#if HAVE_CONFIG_H |
113 | 113 |
#include "clamav-config.h" |
... | ... |
@@ -514,9 +517,18 @@ fileblobSetFilename(fileblob *fb, const char *dir, const char *filename) |
514 | 514 |
|
515 | 515 |
assert(filename != NULL); |
516 | 516 |
|
517 |
+#ifdef C_QNX6 |
|
518 |
+ /* |
|
519 |
+ * QNX6 support from mikep@kaluga.org to fix bug where mkstemp |
|
520 |
+ * can return ETOOLONG even when the file name isn't too long |
|
521 |
+ */ |
|
522 |
+ snprintf(fullname, sizeof(fullname), "%s/clamavtmpXXXXXXXXXXXXX", dir); |
|
523 |
+#else |
|
517 | 524 |
snprintf(fullname, sizeof(fullname) - 1 - suffixLen, "%s/%.*sXXXXXX", dir, |
518 | 525 |
(int)(sizeof(fullname) - 9 - suffixLen - strlen(dir)), filename); |
519 |
-#if defined(C_LINUX) || defined(C_BSD) || defined(HAVE_MKSTEMP) || defined(C_SOLARIS) || defined(C_CYGWIN) |
|
526 |
+#endif |
|
527 |
+ |
|
528 |
+#if defined(C_LINUX) || defined(C_BSD) || defined(HAVE_MKSTEMP) || defined(C_SOLARIS) || defined(C_CYGWIN) || defined(C_QNX6) |
|
520 | 529 |
cli_dbgmsg("fileblobSetFilename: mkstemp(%s)\n", fullname); |
521 | 530 |
fd = mkstemp(fullname); |
522 | 531 |
#else |