[Asterisk-cvs] asterisk config.c,1.38,1.39
markster at lists.digium.com
markster at lists.digium.com
Wed Dec 15 11:03:29 CST 2004
Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv30162
Modified Files:
config.c
Log Message:
Fix glob issue on solaris (bug #3047)
Index: config.c
===================================================================
RCS file: /usr/cvsroot/asterisk/config.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- config.c 11 Dec 2004 22:46:10 -0000 1.38
+++ config.c 15 Dec 2004 16:00:10 -0000 1.39
@@ -513,7 +513,11 @@
int glob_ret;
glob_t globbuf;
globbuf.gl_offs = 0; /* initialize it to silence gcc */
- glob_ret = glob(fn, GLOB_NOMATCH|GLOB_BRACE, NULL, &globbuf);
+#ifdef SOLARIS
+ glob_ret = glob(fn, GLOB_NOMAGIC, NULL, &globbuf);
+#else
+ glob_ret = glob(fn, GLOB_NOMAGIC|GLOB_BRACE, NULL, &globbuf);
+#endif
if (glob_ret == GLOB_NOSPACE)
ast_log(LOG_WARNING,
"Glob Expansion of pattern '%s' failed: Not enough memory\n", fn);
More information about the svn-commits
mailing list