RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: rpm                              Date:   22-Jul-2007 20:40:43
  Branch: HEAD                             Handle: 2007072219404300

  Modified files:
    rpm/rpmio               macro.c

  Log:
    backout the macro syntax extension patch one last time.

  Summary:
    Revision    Changes     Path
    2.140       +3  -21     rpm/rpmio/macro.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/rpmio/macro.c
  ============================================================================
  $ cvs diff -u -r2.139 -r2.140 macro.c
  --- rpm/rpmio/macro.c	22 Jul 2007 10:45:57 -0000	2.139
  +++ rpm/rpmio/macro.c	22 Jul 2007 18:40:43 -0000	2.140
  @@ -1145,7 +1145,6 @@
   	buf[gn] = '\0';
   	(void) expandU(mb, buf, bufn);
       }
  -#ifdef	NOTYET
       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]);)
  @@ -1153,9 +1152,7 @@
   	b = buf;
   	be = stpncpy( stpcpy(b, "%patch -P "), f+c, fn-c);
   	*be = '\0';
  -    } else
  -#endif
  -    if (STREQ("basename", f, fn)) {
  +    } else if (STREQ("basename", f, fn)) {
   	if ((b = strrchr(buf, '/')) == NULL)
   	    b = buf;
   	else
  @@ -1254,10 +1251,9 @@
       MacroEntry *mep;
       MacroEntry me;
       const char *s = mb->s, *se;
  -    const char *e, *ee;
       const char *f, *fe;
       const char *g, *ge;
  -    size_t en, fn, gn;
  +    size_t fn, gn;
       char *t = mb->t;	/* save expansion pointer for printExpand */
       int c;
       int rc = 0;
  @@ -1293,7 +1289,6 @@
   	}
   
   	/* Expand next macro */
  -	e = ee = NULL;
   	f = fe = NULL;
   	g = ge = NULL;
   	if (mb->depth > 1)	/* XXX full expansion for outermost level */
  @@ -1388,16 +1383,10 @@
   		default:
   			/*@innerbreak@*/ break;
   		}
  -		/* Reset to end-of-macro-name span. */
  -		for (e = f, ee = e; (c = *ee) && (xisalnum(c) || c == '_');)
  -			ee++;
   		/*@switchbreak@*/ break;
   	}
   
   	/* XXX Everything below expects fe > f */
  -	if (!e) e = f;
  -	if (!ee) ee = fe;
  -	en = (ee - e);
   	fn = (fe - f);
   	gn = (ge - g);
   	if ((fe - f) <= 0) {
  @@ -1500,7 +1489,6 @@
   	}
   #endif
   
  -#ifdef	NOTYET
   	/* Rewrite "%patchNN ..." as "%patch -P NN ..." and expand. */
   	if (lastc != NULL && fn > 5 && STREQ("patch", f, 5) && xisdigit(f[5])) {
   		/*@-internalglobs@*/ /* FIX: verbose may be set */
  @@ -1509,7 +1497,6 @@
   		s = lastc;
   		continue;
   	}
  -#endif
   
   	/* XXX necessary but clunky */
   	if (STREQ("basename", f, fn) ||
  @@ -1531,7 +1518,7 @@
   	}
   
   	/* Expand defined macros */
  -	mep = findEntry(mb->mc, e, en);
  +	mep = findEntry(mb->mc, f, fn);
   	me = (mep ? *mep : NULL);
   
   	/* XXX Special processing for flags */
  @@ -1550,11 +1537,6 @@
   		if (me && me->body && *me->body) {/* Expand %{-f}/%{-f*} */
   			rc = expandT(mb, me->body, strlen(me->body));
   		}
  -		/* Append %{?_foo/bar}. */
  -		if (!g && se[-1] == '}' && *ee == '/') {
  -			while ((c = *ee++) && ee < se)
  -				SAVECHAR(mb, c);
  -		}
   		s = se;
   		continue;
   	}
  @@ .