diff options
| author | jbj <devnull@localhost> | 1999-12-12 01:46:13 +0000 |
|---|---|---|
| committer | jbj <devnull@localhost> | 1999-12-12 01:46:13 +0000 |
| commit | b438e61808c5a81b6d648a632278b6adc7db680e (patch) | |
| tree | 728f5c1eee94d6a38bc999119d5b303d837c62aa /build | |
| parent | 6f2127f425eea67893d12dc12e4f2bba2a64a100 (diff) | |
| download | librpm-tizen-b438e61808c5a81b6d648a632278b6adc7db680e.tar.gz librpm-tizen-b438e61808c5a81b6d648a632278b6adc7db680e.tar.bz2 librpm-tizen-b438e61808c5a81b6d648a632278b6adc7db680e.zip | |
perform glob on remote ftp queries.
fix: ftpAbort must close the data channel to read abort status.
CVS patchset: 3477
CVS date: 1999/12/12 01:46:13
Diffstat (limited to 'build')
| -rw-r--r-- | build/files.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/build/files.c b/build/files.c index 8cf9dc350..933fab634 100644 --- a/build/files.c +++ b/build/files.c @@ -1105,13 +1105,14 @@ fprintf(stderr, "*** PBF fileURL %s\n", fileURL); diskURL = rpmGenPath(fl->buildRootURL, NULL, fileURL); if (doGlob) { + int i; +#ifdef DYING const char * diskRoot; const char * globURL; char * globRoot = NULL; glob_t glob_result; size_t maxb, nb; int ut; - int i; glob_result.gl_pathc = 0; glob_result.gl_pathv = NULL; @@ -1157,6 +1158,18 @@ fprintf(stderr, "*** GLOB maxb %d diskURL %d %*s globURL %p %s\n", maxb, nb, nb, rc = addFile(fl, globURL, NULL); } Globfree(&glob_result); +#else + int argc = 0; + const char ** argv = NULL; + rc = remoteGlob(diskURL, &argc, &argv); + if (rc == 0) { + for (i = 0; i < argc; i++) { + rc = addFile(fl, argv[i], NULL); + xfree(argv[i]); + } + xfree(argv); + } +#endif /* DYING */ } else { rc = addFile(fl, diskURL, NULL); } |