RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 22-Jul-2007 02:54:19
Branch: HEAD Handle: 2007072201541900
Modified files:
rpm CHANGES
rpm/rpmio macro.c
Log:
revert 2.127.
Summary:
Revision Changes Path
1.1507 +0 -3 rpm/CHANGES
2.132 +35 -49 rpm/rpmio/macro.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.1506 -r1.1507 CHANGES
--- rpm/CHANGES 21 Jul 2007 19:16:49 -0000 1.1506
+++ rpm/CHANGES 22 Jul 2007 00:54:19 -0000 1.1507
@@ -4,9 +4,6 @@
- jbj: perl.prov fiddles (#249135).
- jbj: rescuscitate rpm-python, include <rpmio.h> explicitly.
- jbj: adopt rpm.org signal handling <[EMAIL PROTECTED]>
- - jbj: unbreak macros by using [e,ee) and en as count. todo: look fe
usage.
- - jbj: use _macro_BUFSIZ, not compiled in BUFSIZ, to size expansion
targets.
- - jbj: enable %{dirname:...} macro primitive.
- jbj: add %{?dir/file} as shorthand for %{?dir:%{dir}/file}.
- jbj: fix a --import memory leak.
- rse: unbreak big-endian handling in memory and cryptography functions
by Autoconf providing WORDS_BIGENDIAN and fixing usage
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/macro.c
============================================================================
$ cvs diff -u -r2.131 -r2.132 macro.c
--- rpm/rpmio/macro.c 22 Jul 2007 00:46:05 -0000 2.131
+++ rpm/rpmio/macro.c 22 Jul 2007 00:54:19 -0000 2.132
@@ -132,8 +132,6 @@
#define MACRO_CHUNK_SIZE 16
-static size_t _macro_BUFSIZ = 16 * BUFSIZ;
-
/* forward ref */
static int expandMacro(MacroBuf mb)
/[EMAIL PROTECTED] rpmGlobalMacroContext,
@@ -604,19 +602,18 @@
/[EMAIL PROTECTED] rpmGlobalMacroContext, h_errno, fileSystem @*/
/[EMAIL PROTECTED] mb, rpmGlobalMacroContext, fileSystem @*/
{
- size_t bufn = _macro_BUFSIZ;
- char * buf = alloca(bufn);
+ char pcmd[BUFSIZ];
FILE *shf;
int rc;
int c;
- strncpy(buf, cmd, clen);
- buf[clen] = '\0';
- rc = expandU(mb, buf, bufn);
+ strncpy(pcmd, cmd, clen);
+ pcmd[clen] = '\0';
+ rc = expandU(mb, pcmd, sizeof(pcmd));
if (rc)
return rc;
- if ((shf = popen(buf, "r")) == NULL)
+ if ((shf = popen(pcmd, "r")) == NULL)
return 1;
while(mb->nb > 0 && (c = fgetc(shf)) != EOF)
SAVECHAR(mb, c);
@@ -645,9 +642,7 @@
/[EMAIL PROTECTED] mb, rpmGlobalMacroContext @*/
{
const char *s = se;
- size_t bufn = _macro_BUFSIZ;
- char *buf = alloca(bufn);
- char *n = buf, *ne;
+ char buf[BUFSIZ], *n = buf, *ne;
char *o = NULL, *oe;
char *b, *be;
int c;
@@ -757,7 +752,7 @@
}
/[EMAIL PROTECTED]@*/
- if (expandbody && expandU(mb, b, (&buf[bufn] - b))) {
+ if (expandbody && expandU(mb, b, (&buf[sizeof(buf)] - b))) {
rpmError(RPMERR_BADSPEC, _("Macro %%%s failed to expand\n"), n);
return se;
}
@@ -784,8 +779,7 @@
/[EMAIL PROTECTED] mc, rpmGlobalMacroContext @*/
{
const char *s = se;
- char *buf = alloca(_macro_BUFSIZ);
- char *n = buf, *ne = n;
+ char buf[BUFSIZ], *n = buf, *ne = n;
int c;
COPYNAME(ne, s, c);
@@ -952,9 +946,7 @@
/[EMAIL PROTECTED] rpmGlobalMacroContext @*/
/[EMAIL PROTECTED] mb, rpmGlobalMacroContext @*/
{
- size_t bufn = _macro_BUFSIZ;
- char *buf = alloca(bufn);
- char *b, *be;
+ char buf[BUFSIZ], *b, *be;
char aname[16];
const char *opts, *o;
int argc = 0;
@@ -1004,7 +996,7 @@
#ifdef NOTYET
/* XXX if macros can be passed as args ... */
- expandU(mb, buf, bufn);
+ expandU(mb, buf, sizeof(buf));
#endif
/* Build argv array */
@@ -1107,12 +1099,11 @@
/[EMAIL PROTECTED] rpmGlobalMacroContext, h_errno, fileSystem @*/
/[EMAIL PROTECTED] mb, rpmGlobalMacroContext, fileSystem @*/
{
- size_t bufn = _macro_BUFSIZ + msglen;
- char *buf = alloca(bufn);
+ char buf[BUFSIZ];
strncpy(buf, msg, msglen);
buf[msglen] = '\0';
- (void) expandU(mb, buf, bufn);
+ (void) expandU(mb, buf, sizeof(buf));
if (waserror)
rpmError(RPMERR_BADSPEC, "%s\n", buf);
else
@@ -1134,21 +1125,17 @@
/[EMAIL PROTECTED] rpmGlobalMacroContext, h_errno, fileSystem,
internalState @*/
/[EMAIL PROTECTED] mb, rpmGlobalMacroContext, fileSystem, internalState
@*/
{
- size_t bufn = _macro_BUFSIZ + fn + gn;
- char * buf = alloca(bufn);
- char *b = NULL, *be;
+ char buf[BUFSIZ], *b = NULL, *be;
int c;
buf[0] = '\0';
if (g != NULL) {
strncpy(buf, g, gn);
buf[gn] = '\0';
- (void) expandU(mb, buf, bufn);
+ (void) expandU(mb, buf, sizeof(buf));
}
if (fn > 5 && STREQ("patch", f, 5) && xisdigit(f[5])) {
- /* Skip leading zeros */
- for (c = 5; c < fn-1 && f[c] == '0' && xisdigit(f[c+1]);)
- c++;
+ for ( c = 5 ; c < fn-1 && f[c] == '0' && xisdigit(f[c+1]) ; c++ ) ; /*
Skip leading zeros */
b = buf;
be = stpncpy( stpcpy(b, "%patch -P "), f+c, fn-c);
*be = '\0';
@@ -1157,10 +1144,13 @@
b = buf;
else
b++;
+#if NOTYET
+ /* XXX watchout for conflict with %dir */
} else if (STREQ("dirname", f, fn)) {
if ((b = strrchr(buf, '/')) != NULL)
*b = '\0';
b = buf;
+#endif
} else if (STREQ("suffix", f, fn)) {
if ((b = strrchr(buf, '.')) != NULL)
b++;
@@ -1503,7 +1493,6 @@
/* XXX necessary but clunky */
if (STREQ("basename", f, fn) ||
- STREQ("dirname", f, fn) ||
STREQ("suffix", f, fn) ||
STREQ("expand", f, fn) ||
STREQ("verbose", f, fn) ||
@@ -2026,8 +2015,7 @@
rpmLoadMacroFile(MacroContext mc, const char * fn)
{
FD_t fd = Fopen(fn, "r.fpio");
- size_t bufn = _macro_BUFSIZ;
- char *buf = alloca(bufn);
+ char buf[BUFSIZ];
int rc = -1;
if (fd == NULL || Ferror(fd)) {
@@ -2037,11 +2025,11 @@
/* XXX Assume new fangled macro expansion */
/[EMAIL PROTECTED]@*/
- max_macro_depth = _MAX_MACRO_DEPTH;
+ max_macro_depth = 16;
/[EMAIL PROTECTED]@*/
buf[0] = '\0';
- while(rdcl(buf, bufn, fd) != NULL) {
+ while(rdcl(buf, sizeof(buf), fd) != NULL) {
char c, *n;
n = buf;
@@ -2221,14 +2209,14 @@
const char *s;
char *t, *te;
size_t sn, tn;
- size_t bufn = _macro_BUFSIZ + strlen(arg) + 1;
+ size_t un = 16 * BUFSIZ;
va_list ap;
if (arg == NULL)
return xstrdup("");
- t = xmalloc(bufn);
+ t = xmalloc(strlen(arg) + un + 1);
*t = '\0';
te = stpcpy(t, arg);
@@ -2237,7 +2225,7 @@
while ((s = va_arg(ap, const char *)) != NULL) {
sn = strlen(s);
tn = (te - t);
- t = xrealloc(t, tn + sn + bufn + 1);
+ t = xrealloc(t, tn + sn + un + 1);
te = t + tn;
te = stpcpy(te, s);
}
@@ -2246,8 +2234,8 @@
*te = '\0';
tn = (te - t);
- (void) expandMacros(NULL, NULL, t, tn + bufn + 1);
- t[tn + bufn] = '\0';
+ (void) expandMacros(NULL, NULL, t, tn + un + 1);
+ t[tn + un] = '\0';
t = xrealloc(t, strlen(t) + 1);
return t;
@@ -2375,8 +2363,7 @@
const char *
rpmGetPath(const char *path, ...)
{
- size_t bufn = _macro_BUFSIZ;
- char *buf = alloca(bufn);
+ char buf[BUFSIZ];
const char * s;
char * t, * te;
va_list ap;
@@ -2396,7 +2383,7 @@
}
va_end(ap);
/[EMAIL PROTECTED]@*/
- (void) expandMacros(NULL, NULL, buf, bufn);
+ (void) expandMacros(NULL, NULL, buf, sizeof(buf));
/[EMAIL PROTECTED]@*/
(void) rpmCleanPath(buf);
@@ -2526,26 +2513,25 @@
int
main(int argc, char *argv[])
{
- size_t bufn = _macro_BUFSIZ;
- char *buf = alloca(bufn);
+ char buf[BUFSIZ];
FILE *fp;
int x;
rpmInitMacros(NULL, rpmMacrofiles);
if ((fp = fopen(testfile, "r")) != NULL) {
- while(rdcl(buf, bufn, fp)) {
- x = expandMacros(NULL, NULL, buf, bufn);
+ while(rdcl(buf, sizeof(buf), fp)) {
+ x = expandMacros(NULL, NULL, buf, sizeof(buf));
fprintf(stderr, "%d->%s\n", x, buf);
- memset(buf, 0, bufn);
+ memset(buf, 0, sizeof(buf));
}
fclose(fp);
}
- while(rdcl(buf, bufn, stdin)) {
- x = expandMacros(NULL, NULL, buf, bufn);
+ while(rdcl(buf, sizeof(buf), stdin)) {
+ x = expandMacros(NULL, NULL, buf, sizeof(buf));
fprintf(stderr, "%d->%s\n <-\n", x, buf);
- memset(buf, 0, bufn);
+ memset(buf, 0, sizeof(buf));
}
rpmFreeMacros(NULL);
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository [email protected]
