Blame SOURCES/popt-1.16-glob-error.patch
|
 |
093822 |
Backport of upstream http://rpm5.org/cvs/chngview?cn=19258
|
|
|
093822 |
|
|
|
093822 |
--- popt-1.16/poptconfig.c 2009-05-20 15:18:07.000000000 +0200
|
|
|
093822 |
+++ popt-1.16/poptconfig.c.glob-error 2017-10-12 23:33:28.868435647 +0200
|
|
|
093822 |
@@ -108,7 +108,7 @@
|
|
|
093822 |
if (glob_pattern_p(pat, 0)) {
|
|
|
093822 |
glob_t _g, *pglob = &_;;
|
|
|
093822 |
|
|
|
093822 |
- if (!glob(pat, poptGlobFlags, poptGlob_error, pglob)) {
|
|
|
093822 |
+ if (!(rc = glob(pat, poptGlobFlags, poptGlob_error, pglob))) {
|
|
|
093822 |
if (acp) {
|
|
|
093822 |
*acp = (int) pglob->gl_pathc;
|
|
|
093822 |
pglob->gl_pathc = 0;
|
|
|
093822 |
@@ -122,6 +122,10 @@
|
|
|
093822 |
/*@-nullstate@*/
|
|
|
093822 |
globfree(pglob);
|
|
|
093822 |
/*@=nullstate@*/
|
|
|
093822 |
+ } else if (rc == GLOB_NOMATCH) {
|
|
|
093822 |
+ *avp = NULL;
|
|
|
093822 |
+ *acp = 0;
|
|
|
093822 |
+ rc = 0;
|
|
|
093822 |
} else
|
|
|
093822 |
rc = POPT_ERROR_ERRNO;
|
|
|
093822 |
} else
|