folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

void stepping on toes of relatives, part 5 

- Eliminate remaining (hopefully) C++ reserved keywords in rpmbuild cli tool
This commit is contained in:
Panu Matilainen 2010-09-21 15:11:04 +03:00
parent 0e4d3de131
commit df960a66cf
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rpmbuild.c
View File

@ -289,7 +289,7 @@ static char * getTarSpec(const char *arg)
char *specDir; char *specDir;
char *specBase; char *specBase;
char *tmpSpecFile; char *tmpSpecFile;
const char **try; const char **spec;
char tarbuf[BUFSIZ]; char tarbuf[BUFSIZ];
int gotspec = 0, res; int gotspec = 0, res;
static const char *tryspec[] = { "Specfile", "\\*.spec", NULL }; static const char *tryspec[] = { "Specfile", "\\*.spec", NULL };
@ -299,12 +299,12 @@ static char * getTarSpec(const char *arg)
(void) close(mkstemp(tmpSpecFile)); (void) close(mkstemp(tmpSpecFile));
for (try = tryspec; *try != NULL; try++) { for (spec = tryspec; *spec != NULL; spec++) {
FILE *fp; FILE *fp;
char *cmd; char *cmd;
cmd = rpmExpand("%{uncompress: ", arg, "} | ", cmd = rpmExpand("%{uncompress: ", arg, "} | ",
"%{__tar} xOvf - --wildcards ", *try, "%{__tar} xOvf - --wildcards ", *spec,
" 2>&1 > ", tmpSpecFile, NULL); " 2>&1 > ", tmpSpecFile, NULL);
if (!(fp = popen(cmd, "r"))) { if (!(fp = popen(cmd, "r"))) {