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: 29-Aug-2014 16:36:32
Branch: rpm-5_4 Handle: 2014082914363200
Modified files: (Branch: rpm-5_4)
rpm/rpmio poptIO.c
Log:
- strip versioned suffixes in narrower scope.
Summary:
Revision Changes Path
1.94.2.11 +5 -5 rpm/rpmio/poptIO.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/rpmio/poptIO.c
============================================================================
$ cvs diff -u -r1.94.2.10 -r1.94.2.11 poptIO.c
--- rpm/rpmio/poptIO.c 27 Aug 2014 20:56:22 -0000 1.94.2.10
+++ rpm/rpmio/poptIO.c 29 Aug 2014 14:36:32 -0000 1.94.2.11
@@ -768,7 +768,6 @@
{
poptContext optCon;
char * arg0 = argv[0];
- char * t;
int rc;
#ifdef NOTYET
int i;
@@ -780,10 +779,6 @@
/*@=noeffect@*/
#endif
- /* XXX strip off trailing -$(VERSION) suffix */
- if ((t = strchr(arg0, '-')) != NULL)
- *t = '\0';
-
/*@-globs -mods@*/
setprogname(arg0); /* Retrofit glibc __progname */
@@ -838,8 +833,13 @@
/* XXX strip off the "lt-" prefix so that rpmpopt aliases "work". */
{ static const char lt_[] = "lt-";
const char * s = __progname;
+ char * t;
if (!strncmp(s, lt_, sizeof(lt_)-1))
s += sizeof(lt_)-1;
+ /* XXX strip off trailing -$(VERSION) suffix */
+ if ((t = strrchr(s, '-')) != NULL && !strcmp(t+1, VERSION))
+ *t = '\0';
+
/*@-nullpass -temptrans@*/
optCon = poptGetContext(s, argc, (const char **)argv, optionsTable,
_rpmio_popt_context_flags);
/*@=nullpass =temptrans@*/
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
