[CVS] RPM: rpm/ build.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 05-Apr-2011 21:50:24 Branch: HEAD Handle: 2011040519502400 Modified files: rpm build.c Log: revert unicode change Summary: RevisionChanges Path 2.126 +1 -1 rpm/build.c patch -p0 '@@ .' Index: rpm/build.c $ cvs diff -u -r2.125 -r2.126 build.c --- rpm/build.c 5 Apr 2011 19:29:40 - 2.125 +++ rpm/build.c 5 Apr 2011 19:50:24 - 2.126 @@ -88,7 +88,7 @@ /*@switchbreak@*/ break; /*@-boundsread@*/ default: - if (checking !(isprint(*s) || isspace(*s)) *(unsigned char *)s 32) return 0; + if (checking !(isprint(*s) || isspace(*s))) return 0; /*@switchbreak@*/ break; /*@=boundsread@*/ } @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ build.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 05-Apr-2011 21:55:02 Branch: HEAD Handle: 2011040519550100 Modified files: rpm build.c Log: revert unicode change Summary: RevisionChanges Path 2.128 +1 -1 rpm/build.c patch -p0 '@@ .' Index: rpm/build.c $ cvs diff -u -r2.127 -r2.128 build.c --- rpm/build.c 5 Apr 2011 19:51:49 - 2.127 +++ rpm/build.c 5 Apr 2011 19:55:01 - 2.128 @@ -88,7 +88,7 @@ /*@switchbreak@*/ break; /*@-boundsread@*/ default: - if (checking !(isprint(*s) || isspace(*s)) *(unsigned char *)s 32) return 0; + if (checking !(isprint(*s) || isspace(*s))) return 0; /*@switchbreak@*/ break; /*@=boundsread@*/ } @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ build.c build.h rpm/lib/ rpmcli.h rpm/ rpmqv.c
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: 10-Feb-2010 21:24:51
Branch: HEAD Handle: 2010021020244901
Modified files:
rpm build.c build.h rpmqv.c
rpm/lib rpmcli.h
Log:
- add specFile to build arguments container.
Summary:
RevisionChanges Path
2.124 +5 -4 rpm/build.c
2.22+1 -2 rpm/build.h
2.99+1 -0 rpm/lib/rpmcli.h
1.165 +10 -12 rpm/rpmqv.c
patch -p0 '@@ .'
Index: rpm/build.c
$ cvs diff -u -r2.123 -r2.124 build.c
--- rpm/build.c 1 Aug 2008 12:33:30 - 2.123
+++ rpm/build.c 10 Feb 2010 20:24:49 - 2.124
@@ -99,7 +99,7 @@
/**
*/
/*...@-boundswrite@*/
-static int buildForTarget(rpmts ts, const char * arg, BTA_t ba)
+static int buildForTarget(rpmts ts, BTA_t ba)
/*...@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState
@*/
/*...@modifies ts, rpmGlobalMacroContext, fileSystem, internalState @*/
{
@@ -111,6 +111,7 @@
int specut;
const char * s;
char * se;
+const char * arg = ba-specFile;
size_t nb = strlen(arg) + BUFSIZ;
char * buf = alloca(nb);
Spec spec = NULL;
@@ -257,7 +258,7 @@
}
/*...@=boundswrite@*/
-int build(rpmts ts, const char * arg, BTA_t ba, const char * rcfile)
+int build(rpmts ts, BTA_t ba, const char * rcfile)
{
const char *t, *te;
int rc = 0;
@@ -278,7 +279,7 @@
ovsflags = rpmtsSetVSFlags(ts, vsflags);
if (targets == NULL) {
- rc = buildForTarget(ts, arg, ba);
+ rc = buildForTarget(ts, ba);
nbuilds++;
goto exit;
}
@@ -308,7 +309,7 @@
rpmFreeRpmrc();
(void) rpmReadConfigFiles(rcfile, target);
}
- rc = buildForTarget(ts, arg, ba);
+ rc = buildForTarget(ts, ba);
nbuilds++;
if (rc)
break;
@@ .
patch -p0 '@@ .'
Index: rpm/build.h
$ cvs diff -u -r2.21 -r2.22 build.h
--- rpm/build.h 6 Jul 2007 18:45:52 - 2.21
+++ rpm/build.h 10 Feb 2010 20:24:49 - 2.22
@@ -5,8 +5,7 @@
extern C {
#endif
-int build(rpmts ts, const char * arg, BTA_t ba,
- /*...@null@*/ const char * rcfile)
+int build(rpmts ts, BTA_t ba, /*...@null@*/ const char * rcfile)
/*...@globals rpmGlobalMacroContext, rpmCLIMacroContext,
h_errno, fileSystem, internalState @*/
/*...@modifies ts, ba-buildAmount, rpmGlobalMacroContext,
rpmCLIMacroContext,
@@ .
patch -p0 '@@ .'
Index: rpm/lib/rpmcli.h
$ cvs diff -u -r2.98 -r2.99 rpmcli.h
--- rpm/lib/rpmcli.h 4 Jan 2010 03:51:37 - 2.98
+++ rpm/lib/rpmcli.h 10 Feb 2010 20:24:50 - 2.99
@@ -736,6 +736,7 @@
const char * passPhrase; /*! Pass phrase. */
/*...@only@*/ /*...@null@*/
const char * cookie; /*! NULL for binary, ??? for source, rpm's */
+const char * specFile; /*! from --rebuild/--recompile build */
int noBuild; /*! from --nobuild */
int noDeps; /*! from --nodeps */
int noLang; /*! from --nolang */
@@ .
patch -p0 '@@ .'
Index: rpm/rpmqv.c
$ cvs diff -u -r1.164 -r1.165 rpmqv.c
--- rpm/rpmqv.c 4 Jan 2010 03:51:37 - 1.164
+++ rpm/rpmqv.c 10 Feb 2010 20:24:49 - 1.165
@@ -394,15 +394,15 @@
#endif
#ifdef IAM_RPMEIU
- QVA_t ia = rpmIArgs;
+QVA_t ia = rpmIArgs;
#endif
#if defined(IAM_RPMDB)
- QVA_t da = rpmDBArgs;
+QVA_t da = rpmDBArgs;
#endif
#if defined(IAM_RPMK)
- QVA_t ka = rpmQVKArgs;
+QVA_t ka = rpmQVKArgs;
#endif
#if defined(IAM_RPMBT) || defined(IAM_RPMK)
@@ -781,22 +781,21 @@
}
while ((pkg = poptGetArg(optCon))) {
- const char * specFile = NULL;
-
if (nbuilds++ 0) {
rpmFreeMacros(NULL);
rpmFreeRpmrc();
(void) rpmReadConfigFiles(NULL, NULL);
}
+ ba-specFile = NULL;
ba-cookie = NULL;
- ec = rpmInstallSource(ts, pkg, specFile, ba-cookie);
+ ec = rpmInstallSource(ts, pkg,
[CVS] RPM: rpm/ build.c rpm/lib/ rpmds.c rpmrc.c rpmrc.h
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: 01-Aug-2008 14:33:31
Branch: HEAD Handle: 2008080112333000
Modified files:
rpm build.c
rpm/lib rpmds.c rpmrc.c rpmrc.h
Log:
- jbj: solaris: use Glob, not glob.
- jbj: remove rpmSetTables from API.
Summary:
RevisionChanges Path
2.123 +0 -4 rpm/build.c
2.99+2 -2 rpm/lib/rpmds.c
2.241 +26 -3 rpm/lib/rpmrc.c
1.2 +0 -24 rpm/lib/rpmrc.h
patch -p0 '@@ .'
Index: rpm/build.c
$ cvs diff -u -r2.122 -r2.123 build.c
--- rpm/build.c 31 Jul 2008 00:21:39 - 2.122
+++ rpm/build.c 1 Aug 2008 12:33:30 - 2.123
@@ -118,10 +118,6 @@
int xx;
int rc;
-#ifndef DYING
-rpmSetTables(RPM_MACHTABLE_BUILDARCH, RPM_MACHTABLE_BUILDOS);
-#endif
-
if (ba-buildMode == 't') {
static const char * sfpats[] = { Specfile, \\*.spec, NULL };
static const char _specfn[] = %{mkstemp:%{_specdir}/rpm-spec.XX};
@@ .
patch -p0 '@@ .'
Index: rpm/lib/rpmds.c
$ cvs diff -u -r2.98 -r2.99 rpmds.c
--- rpm/lib/rpmds.c 31 Jul 2008 02:40:06 - 2.98
+++ rpm/lib/rpmds.c 1 Aug 2008 12:33:30 - 2.99
@@ -3281,7 +3281,7 @@
if (_rpmds_debug 0)
fprintf(stderr, *** rpmdsRldpath(%p, %s) globbing %s\n, PRCO, rldp, buf);
- xx = glob(buf, 0, NULL, gl);
+ xx = Glob(buf, 0, NULL, gl);
if (xx) /* glob error, probably GLOB_NOMATCH */
continue;
@@ -3311,7 +3311,7 @@
xx = rpmdsELF(DSOfn, 0, rpmdsMergePRCO, PRCO);
}
/[EMAIL PROTECTED]@*/
- globfree(gl);
+ Globfree(gl);
/[EMAIL PROTECTED]@*/
}
rc = 0;
@@ .
patch -p0 '@@ .'
Index: rpm/lib/rpmrc.c
$ cvs diff -u -r2.240 -r2.241 rpmrc.c
--- rpm/lib/rpmrc.c 31 Jul 2008 02:40:06 - 2.240
+++ rpm/lib/rpmrc.c 1 Aug 2008 12:33:30 - 2.241
@@ -37,6 +37,20 @@
/[EMAIL PROTECTED]@*/
int nplatpat = 0;
+
+/** \ingroup rpmrc
+ * Build and install arch/os table identifiers.
+ * @deprecated Eliminate from API.
+ * @todo Eliminate in rpm-5.1.
+ */
+enum rpm_machtable_e {
+RPM_MACHTABLE_INSTARCH = 0,/*! Install platform architecture. */
+RPM_MACHTABLE_INSTOS = 1,/*! Install platform operating system.
*/
+RPM_MACHTABLE_BUILDARCH = 2,/*! Build platform architecture. */
+RPM_MACHTABLE_BUILDOS= 3 /*! Build platform operating system. */
+};
+#define RPM_MACHTABLE_COUNT 4 /*! No. of arch/os tables. */
+
typedef /[EMAIL PROTECTED]@*/ const char * cptr_t;
typedef struct machCacheEntry_s {
@@ -619,9 +633,18 @@
if (os) *os = un.sysname;
}
-void rpmSetTables(int archTable, int osTable)
- /[EMAIL PROTECTED] currTables @*/
- /[EMAIL PROTECTED] currTables @*/
+/** \ingroup rpmrc
+ * @deprecated Use addMacro to set _target_* macros.
+ * @todo Eliminate in rpm-5.1.
+ # @note Only used by build code.
+ * @param archTable
+ * @param osTable
+ */
+static void rpmSetTables(int archTable, int osTable)
+ /[EMAIL PROTECTED] currTables, rpmGlobalMacroContext, h_errno,
+ fileSystem, internalState @*/
+ /[EMAIL PROTECTED] currTables, rpmGlobalMacroContext,
+ fileSystem, internalState @*/
{
const char * arch, * os;
@@ .
patch -p0 '@@ .'
Index: rpm/lib/rpmrc.h
$ cvs diff -u -r1.1 -r1.2 rpmrc.h
--- rpm/lib/rpmrc.h 1 Aug 2008 10:55:13 - 1.1
+++ rpm/lib/rpmrc.h 1 Aug 2008 12:33:30 - 1.2
@@ -10,19 +10,6 @@
#endif
/** \ingroup rpmrc
- * Build and install arch/os table identifiers.
- * @deprecated Eliminate from API.
- * @todo Eliminate in rpm-5.1.
- */
-enum rpm_machtable_e {
-RPM_MACHTABLE_INSTARCH = 0,/*! Install platform architecture. */
-RPM_MACHTABLE_INSTOS = 1,/*! Install platform operating system.
*/
-RPM_MACHTABLE_BUILDARCH = 2,/*! Build platform architecture. */
-RPM_MACHTABLE_BUILDOS= 3 /*! Build platform operating system. */
-};
-#define RPM_MACHTABLE_COUNT 4 /*! No. of arch/os
