RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 14-Jun-2009 20:17:06
Branch: HEAD Handle: 2009061418170600
Modified files:
rpm CHANGES
rpm/lib rpmfc.c
rpm/rpmio argv.c argv.h
Log:
- argv: add a separator character argument to argvJoin.
Summary:
Revision Changes Path
1.3024 +1 -0 rpm/CHANGES
1.66 +1 -1 rpm/lib/rpmfc.c
1.19 +2 -2 rpm/rpmio/argv.c
1.15 +2 -1 rpm/rpmio/argv.h
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3023 -r1.3024 CHANGES
--- rpm/CHANGES 13 Jun 2009 20:05:35 -0000 1.3023
+++ rpm/CHANGES 14 Jun 2009 18:17:06 -0000 1.3024
@@ -1,5 +1,6 @@
5.2b1 -> 5.3a1
+ - jbj: argv: add a separator character argument to argvJoin.
- jbj: augeas: add "no brainer" rpmaug wrappings onto augeas methods.
- jbj: rpmbuild: fix: ensure dependency EVR strings have only 0 or 1
dashes.
- jbj: augeas: add aug_init() and aug_close() calls to the rpmaug
wrapper.
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmfc.c
============================================================================
$ cvs diff -u -r1.65 -r1.66 rpmfc.c
--- rpm/lib/rpmfc.c 11 Apr 2009 14:17:58 -0000 1.65
+++ rpm/lib/rpmfc.c 14 Jun 2009 18:17:06 -0000 1.66
@@ -206,7 +206,7 @@
(unsigned)child, (unsigned)reaped, status);
if (failNonZero && (!WIFEXITED(status) || WEXITSTATUS(status))) {
- const char *cmd = argvJoin(argv);
+ const char *cmd = argvJoin(argv, ' ');
int rc = (WIFEXITED(status) ? WEXITSTATUS(status) : -1);
rpmlog(RPMLOG_ERR, _("Command \"%s\" failed, exit(%d)\n"), cmd, rc);
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/argv.c
============================================================================
$ cvs diff -u -r1.18 -r1.19 argv.c
--- rpm/rpmio/argv.c 19 Feb 2009 18:54:42 -0000 1.18
+++ rpm/rpmio/argv.c 14 Jun 2009 18:17:06 -0000 1.19
@@ -263,7 +263,7 @@
/*...@=nullstate@*/
}
-char * argvJoin(ARGV_t argv)
+char * argvJoin(ARGV_t argv, char sep)
{
size_t nb = 0;
int argc;
@@ -280,7 +280,7 @@
*te = '\0';
for (argc = 0; argv[argc] != NULL; argc++) {
if (argc != 0)
- *te++ = ' ';
+ *te++ = sep;
te = stpcpy(te, argv[argc]);
}
*te = '\0';
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/argv.h
============================================================================
$ cvs diff -u -r1.14 -r1.15 argv.h
--- rpm/rpmio/argv.h 1 Oct 2008 15:53:17 -0000 1.14
+++ rpm/rpmio/argv.h 14 Jun 2009 18:17:06 -0000 1.15
@@ -219,10 +219,11 @@
/**
* Concatenate an argv array into a string.
* @param argv argv array
+ * @param sep arg separator
* @return concatenated string
*/
/*...@only@*/
-char * argvJoin(ARGV_t argv)
+char * argvJoin(ARGV_t argv, char sep)
/*...@*/;
/**
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
