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: 15-Jul-2007 18:32:18
Branch: HEAD Handle: 2007071517321502
Modified files:
rpm CHANGES
rpm/build pack.c parsePreamble.c
rpm/examples dumprpm.c
rpm/lib depends.c fsm.c misc.c psm.c rpmchecksig.c rpmgi.c
rpminstall.c rpmrollback.c rpmts.c
rpm/python rpmfd-py.c
rpm/rpmdb legacy.c rpmdb.c
rpm/rpmio html-parse.c rpmio.c tget.c tput.c trpmio.c
Log:
- remove network transport from all rpm libraries.
Summary:
Revision Changes Path
1.1466 +1 -0 rpm/CHANGES
2.214 +4 -4 rpm/build/pack.c
2.127 +1 -1 rpm/build/parsePreamble.c
1.3 +2 -2 rpm/examples/dumprpm.c
1.333 +2 -2 rpm/lib/depends.c
2.121 +2 -2 rpm/lib/fsm.c
2.139 +1 -1 rpm/lib/misc.c
2.206 +1 -1 rpm/lib/psm.c
1.118 +2 -2 rpm/lib/rpmchecksig.c
2.27 +3 -3 rpm/lib/rpmgi.c
1.149 +4 -4 rpm/lib/rpminstall.c
1.6 +1 -1 rpm/lib/rpmrollback.c
2.81 +1 -1 rpm/lib/rpmts.c
1.20 +1 -1 rpm/python/rpmfd-py.c
1.31 +1 -1 rpm/rpmdb/legacy.c
1.135 +1 -1 rpm/rpmdb/rpmdb.c
1.4 +1 -1 rpm/rpmio/html-parse.c
1.91 +1 -1 rpm/rpmio/rpmio.c
1.9 +1 -1 rpm/rpmio/tget.c
1.4 +2 -2 rpm/rpmio/tput.c
2.7 +5 -5 rpm/rpmio/trpmio.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.1465 -r1.1466 CHANGES
--- rpm/CHANGES 15 Jul 2007 02:09:59 -0000 1.1465
+++ rpm/CHANGES 15 Jul 2007 16:32:15 -0000 1.1466
@@ -1,4 +1,5 @@
4.5 -> 5.0:
+ - jbj: remove network transport from all rpm libraries.
- jbj: don't close stdout by mistake (OpenSuSE).
- jbj: run checkfiles even if failure is imminent (OpenSuSE).
- jbj: rip compiled in %patch, breaking remote patch fetching.
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/pack.c
============================================================================
$ cvs diff -u -r2.213 -r2.214 pack.c
--- rpm/build/pack.c 9 Jun 2007 19:07:57 -0000 2.213
+++ rpm/build/pack.c 15 Jul 2007 16:32:16 -0000 2.214
@@ -140,7 +140,7 @@
fn = rpmGetPath("%{_builddir}/%{?buildsubdir:%{buildsubdir}/}", file, NULL);
- fd = Fopen(fn, "r");
+ fd = Fopen(fn, "r.fdio");
if (fn != buf) fn = _free(fn);
if (fd == NULL || Ferror(fd)) {
sb = freeStringBuf(sb);
@@ -299,7 +299,7 @@
rpmRC rc;
fdi = (fileName != NULL)
- ? Fopen(fileName, "r")
+ ? Fopen(fileName, "r.fdio")
: fdDup(STDIN_FILENO);
if (fdi == NULL || Ferror(fdi)) {
@@ -703,7 +703,7 @@
}
/* Open the output file */
- fd = Fopen(fileName, "w");
+ fd = Fopen(fileName, "w.fdio");
if (fd == NULL || Ferror(fd)) {
rc = RPMERR_CREATE;
rpmError(RPMERR_CREATE, _("Could not open %s: %s\n"),
@@ -753,7 +753,7 @@
goto exit;
/* Append the header and archive */
- ifd = Fopen(sigtarget, "r");
+ ifd = Fopen(sigtarget, "r.fdio");
if (ifd == NULL || Ferror(ifd)) {
rc = RPMERR_READ;
rpmError(RPMERR_READ, _("Unable to open sigtarget %s: %s\n"),
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/parsePreamble.c
============================================================================
$ cvs diff -u -r2.126 -r2.127 parsePreamble.c
--- rpm/build/parsePreamble.c 14 Jul 2007 00:33:23 -0000 2.126
+++ rpm/build/parsePreamble.c 15 Jul 2007 16:32:16 -0000 2.127
@@ -395,7 +395,7 @@
/*@notreached@*/ break;
}
- fd = Fopen(fn, "r");
+ fd = Fopen(fn, "r.fdio");
if (fd == NULL || Ferror(fd)) {
rpmError(RPMERR_BADSPEC, _("Unable to open icon %s: %s\n"),
fn, Fstrerror(fd));
@@ .
patch -p0 <<'@@ .'
Index: rpm/examples/dumprpm.c
============================================================================
$ cvs diff -u -r1.2 -r1.3 dumprpm.c
--- rpm/examples/dumprpm.c 9 Feb 2002 20:08:32 -0000 1.2
+++ rpm/examples/dumprpm.c 15 Jul 2007 16:32:16 -0000 1.3
@@ -45,9 +45,9 @@
int rc;
if( argc == 1 )
- fd = Fopen("-", "r.ufdio" );
+ fd = Fopen("-", "r" );
else
- fd = Fopen( argv[1], "r.ufdio" );
+ fd = Fopen( argv[1], "r" );
if( fd == NULL || Ferror(fd) ) {
fprintf(stderr, "cannot open %s: %s\n",
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/depends.c
============================================================================
$ cvs diff -u -r1.332 -r1.333 depends.c
--- rpm/lib/depends.c 5 Jul 2007 17:13:38 -0000 1.332
+++ rpm/lib/depends.c 15 Jul 2007 16:32:16 -0000 1.333
@@ -744,7 +744,7 @@
if (NSType == RPMNS_TYPE_DIGEST) {
const char * EVR = rpmdsEVR(dep);
- FD_t fd = Fopen(Name, "r");
+ FD_t fd = Fopen(Name, "r.fdio");
rc = 1; /* XXX assume failure */
if (fd && !Ferror(fd)) {
@@ -834,7 +834,7 @@
const char * fn = rpmGetPath("%{_varrun}/", Name, ".pid", NULL);
FD_t fd = NULL;
- if (fn && *fn != '%' && (fd = Fopen(fn, "r")) && !Ferror(fd)) {
+ if (fn && *fn != '%' && (fd = Fopen(fn, "r.fdio")) && !Ferror(fd)) {
char buf[32];
size_t nb = Fread(buf, sizeof(buf[0]), sizeof(buf), fd);
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/fsm.c
============================================================================
$ cvs diff -u -r2.120 -r2.121 fsm.c
--- rpm/lib/fsm.c 12 Jul 2007 10:57:50 -0000 2.120
+++ rpm/lib/fsm.c 15 Jul 2007 16:32:16 -0000 2.121
@@ -2480,7 +2480,7 @@
break;
case FSM_ROPEN:
- fsm->rfd = Fopen(fsm->path, "r");
+ fsm->rfd = Fopen(fsm->path, "r.fdio");
if (fsm->rfd == NULL || Ferror(fsm->rfd)) {
if (fsm->rfd != NULL) (void) fsmNext(fsm, FSM_RCLOSE);
fsm->rfd = NULL;
@@ -2513,7 +2513,7 @@
fsm->rfd = NULL;
break;
case FSM_WOPEN:
- fsm->wfd = Fopen(fsm->path, "w");
+ fsm->wfd = Fopen(fsm->path, "w.fdio");
if (fsm->wfd == NULL || Ferror(fsm->wfd)) {
if (fsm->wfd != NULL) (void) fsmNext(fsm, FSM_WCLOSE);
fsm->wfd = NULL;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/misc.c
============================================================================
$ cvs diff -u -r2.138 -r2.139 misc.c
--- rpm/lib/misc.c 25 May 2007 17:36:02 -0000 2.138
+++ rpm/lib/misc.c 15 Jul 2007 16:32:16 -0000 2.139
@@ -172,7 +172,7 @@
/*@switchbreak@*/ break;
}
- fd = Fopen(tempfn, "w+x");
+ fd = Fopen(tempfn, "w+x.fdio");
/* XXX FIXME: errno may not be correct for ufdio */
} while ((fd == NULL || Ferror(fd)) && errno == EEXIST);
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/psm.c
============================================================================
$ cvs diff -u -r2.205 -r2.206 psm.c
--- rpm/lib/psm.c 15 Jul 2007 02:10:00 -0000 2.205
+++ rpm/lib/psm.c 15 Jul 2007 16:32:16 -0000 2.206
@@ -1695,7 +1695,7 @@
pkgdn = _free(pkgdn);
if (rc == RPMRC_FAIL)
break;
- psm->fd = Fopen(psm->pkgfn, "w");
+ psm->fd = Fopen(psm->pkgfn, "w.fdio");
if (psm->fd == NULL || Ferror(psm->fd)) {
rc = RPMRC_FAIL;
break;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmchecksig.c
============================================================================
$ cvs diff -u -r1.117 -r1.118 rpmchecksig.c
--- rpm/lib/rpmchecksig.c 10 Jul 2007 18:26:54 -0000 1.117
+++ rpm/lib/rpmchecksig.c 15 Jul 2007 16:32:16 -0000 1.118
@@ -52,7 +52,7 @@
/* open a file and set *fdp */
if (*fdp == NULL && fnp != NULL && *fnp != NULL) {
- fd = Fopen(*fnp, ((flags & O_WRONLY) ? "w" : "r"));
+ fd = Fopen(*fnp, ((flags & O_WRONLY) ? "w.fdio" : "r.fdio"));
if (fd == NULL || Ferror(fd)) {
rpmError(RPMERR_OPEN, _("%s: open failed: %s\n"), *fnp,
Fstrerror(fd));
@@ -1094,7 +1094,7 @@
while ((arg = *argv++) != NULL) {
FD_t fd;
- if ((fd = Fopen(arg, "r")) == NULL
+ if ((fd = Fopen(arg, "r.fdio")) == NULL
|| Ferror(fd)
|| rpmVerifySignatures(qva, ts, fd, arg))
res++;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmgi.c
============================================================================
$ cvs diff -u -r2.26 -r2.27 rpmgi.c
--- rpm/lib/rpmgi.c 5 Jul 2007 15:38:37 -0000 2.26
+++ rpm/lib/rpmgi.c 15 Jul 2007 16:32:16 -0000 2.27
@@ -111,7 +111,7 @@
/*@globals rpmGlobalMacroContext, h_errno, internalState @*/
/*@modifies gi, rpmGlobalMacroContext, h_errno, internalState @*/
{
- FD_t fd = rpmgiOpen(path, "r");
+ FD_t fd = rpmgiOpen(path, "r.fdio");
rpmRC rpmrc = RPMRC_FAIL;
if (fd != NULL) {
@@ -132,7 +132,7 @@
/*@globals rpmGlobalMacroContext, h_errno, internalState @*/
/*@modifies gi, rpmGlobalMacroContext, h_errno, internalState @*/
{
- FD_t fd = rpmgiOpen(path, "r");
+ FD_t fd = rpmgiOpen(path, "r.fdio");
Header h = NULL;
if (fd != NULL) {
@@ -664,7 +664,7 @@
path = _free(path);
path = rpmExpand(_query_hdlist_path, NULL);
}
- gi->fd = rpmgiOpen(path, "rm");
+ gi->fd = rpmgiOpen(path, "rm.fdio");
gi->active = 1;
path = _free(path);
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpminstall.c
============================================================================
$ cvs diff -u -r1.148 -r1.149 rpminstall.c
--- rpm/lib/rpminstall.c 12 Jul 2007 10:57:50 -0000 1.148
+++ rpm/lib/rpminstall.c 15 Jul 2007 16:32:16 -0000 1.149
@@ -119,7 +119,7 @@
if (filename == NULL || filename[0] == '\0')
return NULL;
/*@=boundsread@*/
- fd = Fopen(filename, "r");
+ fd = Fopen(filename, "r.fdio");
/*@-type@*/ /* FIX: still necessary? */
if (fd == NULL || Ferror(fd)) {
rpmError(RPMERR_OPEN, _("open of %s failed: %s\n"), filename,
@@ -482,7 +482,7 @@
(void) urlPath(*eiu->fnp, &fileName);
/* Try to read the header from a package file. */
- eiu->fd = Fopen(*eiu->fnp, "r");
+ eiu->fd = Fopen(*eiu->fnp, "r.fdio");
if (eiu->fd == NULL || Ferror(eiu->fd)) {
rpmError(RPMERR_OPEN, _("open of %s failed: %s\n"), *eiu->fnp,
Fstrerror(eiu->fd));
@@ -716,7 +716,7 @@
if (eiu->sourceURL != NULL)
for (i = 0; i < eiu->numSRPMS; i++) {
if (eiu->sourceURL[i] == NULL) continue;
- eiu->fd = Fopen(eiu->sourceURL[i], "r");
+ eiu->fd = Fopen(eiu->sourceURL[i], "r.fdio");
if (eiu->fd == NULL || Ferror(eiu->fd)) {
rpmMessage(RPMMESS_ERROR, _("cannot open file %s: %s\n"),
eiu->sourceURL[i], Fstrerror(eiu->fd));
@@ -884,7 +884,7 @@
int rc;
- fd = Fopen(arg, "r");
+ fd = Fopen(arg, "r.fdio");
if (fd == NULL || Ferror(fd)) {
rpmMessage(RPMMESS_ERROR, _("cannot open %s: %s\n"), arg, Fstrerror(fd));
if (fd != NULL) (void) Fclose(fd);
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmrollback.c
============================================================================
$ cvs diff -u -r1.5 -r1.6 rpmrollback.c
--- rpm/lib/rpmrollback.c 19 Jun 2007 02:42:15 -0000 1.5
+++ rpm/lib/rpmrollback.c 15 Jul 2007 16:32:16 -0000 1.6
@@ -161,7 +161,7 @@
int_32 count;
int isSource;
- fd = Fopen(av[i], "r");
+ fd = Fopen(av[i], "r.fdio");
if (fd == NULL || Ferror(fd)) {
rpmError(RPMERR_OPEN, _("open of %s failed: %s\n"), av[i],
Fstrerror(fd));
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmts.c
============================================================================
$ cvs diff -u -r2.80 -r2.81 rpmts.c
--- rpm/lib/rpmts.c 9 Jun 2007 19:07:57 -0000 2.80
+++ rpm/lib/rpmts.c 15 Jul 2007 16:32:16 -0000 2.81
@@ -548,7 +548,7 @@
FD_t fd;
rpmRC rpmrc;
- fd = Fopen(str, "r");
+ fd = Fopen(str, "r.fdio");
if (fd == NULL || Ferror(fd)) {
rpmError(RPMERR_OPEN, _("open of %s failed: %s\n"), str,
Fstrerror(fd));
@@ .
patch -p0 <<'@@ .'
Index: rpm/python/rpmfd-py.c
============================================================================
$ cvs diff -u -r1.19 -r1.20 rpmfd-py.c
--- rpm/python/rpmfd-py.c 25 May 2007 17:36:31 -0000 1.19
+++ rpm/python/rpmfd-py.c 15 Jul 2007 16:32:17 -0000 1.20
@@ -110,7 +110,7 @@
/*@modifies fdhead, fdtail @*/
{
char * path;
- char * mode = "r";
+ char * mode = "r.fdio";
FDlist *node;
char * kwlist[] = {"path", "mode", NULL};
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/legacy.c
============================================================================
$ cvs diff -u -r1.30 -r1.31 legacy.c
--- rpm/rpmdb/legacy.c 10 Jul 2007 17:18:12 -0000 1.30
+++ rpm/rpmdb/legacy.c 15 Jul 2007 16:32:17 -0000 1.31
@@ -217,7 +217,7 @@
case URL_IS_DASH:
default:
/* Either use the pipe to prelink -y or open the URL. */
- fd = (pid != 0) ? fdDup(fdno) : Fopen(fn, "r");
+ fd = (pid != 0) ? fdDup(fdno) : Fopen(fn, "r.fdio");
(void) close(fdno);
if (fd == NULL || Ferror(fd)) {
rc = 1;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/rpmdb.c
============================================================================
$ cvs diff -u -r1.134 -r1.135 rpmdb.c
--- rpm/rpmdb/rpmdb.c 27 Jun 2007 11:59:13 -0000 1.134
+++ rpm/rpmdb/rpmdb.c 15 Jul 2007 16:32:17 -0000 1.135
@@ -817,7 +817,7 @@
goto exit;
if (adding) {
- FD_t fd = Fopen(fn, "w");
+ FD_t fd = Fopen(fn, "w.fdio");
int_32 *iidp;
if (fd != NULL) {
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/html-parse.c
============================================================================
$ cvs diff -u -r1.3 -r1.4 html-parse.c
--- rpm/rpmio/html-parse.c 25 Nov 2004 04:31:44 -0000 1.3
+++ rpm/rpmio/html-parse.c 15 Jul 2007 16:32:17 -0000 1.4
@@ -1079,7 +1079,7 @@
_rpmio_debug = 0;
_dav_debug = 0;
- fd = Fopen(htmlpath, "r.ufdio");
+ fd = Fopen(htmlpath, "r");
while ((read_count = Fread (x + length, 1, size - length, fd)))
{
if (read_count <= 0)
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmio.c
============================================================================
$ cvs diff -u -r1.90 -r1.91 rpmio.c
--- rpm/rpmio/rpmio.c 10 Jul 2007 19:04:55 -0000 1.90
+++ rpm/rpmio/rpmio.c 15 Jul 2007 16:32:17 -0000 1.91
@@ -3900,7 +3900,7 @@
FD_t fd;
int rc = 0;
- fd = Fopen(fn, "r.ufdio");
+ fd = Fopen(fn, "r");
if (fd == NULL || Ferror(fd)) {
rc = 2;
goto exit;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/tget.c
============================================================================
$ cvs diff -u -r1.8 -r1.9 tget.c
--- rpm/rpmio/tget.c 14 Jul 2007 22:34:18 -0000 1.8
+++ rpm/rpmio/tget.c 15 Jul 2007 16:32:17 -0000 1.9
@@ -25,7 +25,7 @@
FD_t fd;
fprintf(stderr, "===== %s\n", path);
- fd = Fopen(path, "r.ufdio");
+ fd = Fopen(path, "r");
if (fd != NULL) {
char buf[BUFSIZ];
size_t len = Fread(buf, 1, sizeof(buf), fd);
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/tput.c
============================================================================
$ cvs diff -u -r1.3 -r1.4 tput.c
--- rpm/rpmio/tput.c 14 Jul 2007 22:37:05 -0000 1.3
+++ rpm/rpmio/tput.c 15 Jul 2007 16:32:17 -0000 1.4
@@ -34,7 +34,7 @@
buf[0] = '\0';
fprintf(stderr, "===== Fread %s\n", path);
- fd = Fopen(path, "r.ufdio");
+ fd = Fopen(path, "r");
if (fd != NULL) {
len = Fread(buf, 1, sizeof(buf), fd);
@@ -57,7 +57,7 @@
strcpy(buf, "Hello World!\n");
fprintf(stderr, "===== Fwrite %s\n", path);
- fd = Fopen(path, "w.ufdio");
+ fd = Fopen(path, "w");
if (fd != NULL) {
len = Fwrite(buf, 1, strlen(buf), fd);
xx = Fclose(fd);
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/trpmio.c
============================================================================
$ cvs diff -u -r2.6 -r2.7 trpmio.c
--- rpm/rpmio/trpmio.c 14 Jul 2007 22:42:03 -0000 2.6
+++ rpm/rpmio/trpmio.c 15 Jul 2007 16:32:17 -0000 2.7
@@ -12,10 +12,10 @@
FD_t f1, f2, f3, f4, f5;
fprintf (stderr, "open http://www.gnome.org/\n");
- f1 = Fopen ("http://www.gnome.org/", "r.ufdio");
+ f1 = Fopen ("http://www.gnome.org/", "r");
fprintf (stderr, "open http://people.redhat.com/\n");
- f2 = Fopen ("http://people.redhat.com/", "r.ufdio");
+ f2 = Fopen ("http://people.redhat.com/", "r");
if (f1) {
fprintf (stderr, "close http://www.gnome.org/\n");
@@ -23,7 +23,7 @@
}
fprintf (stderr, "open http://www.redhat.com/\n");
- f3 = Fopen ("http://www.redhat.com/", "r.ufdio");
+ f3 = Fopen ("http://www.redhat.com/", "r");
if (f2) {
fprintf (stderr, "close http://people.redhat.com/\n");
@@ -31,7 +31,7 @@
}
fprintf (stderr, "open http://www.wraptastic.org/\n");
- f4 = Fopen ("http://www.wraptastic.org/", "r.ufdio");
+ f4 = Fopen ("http://www.wraptastic.org/", "r");
if (f3) {
fprintf (stderr, "close http://people.redhat.com/\n");
@@ -39,7 +39,7 @@
}
fprintf (stderr, "open http://people.redhat.com/\n");
- f5 = Fopen ("http://people.redhat.com/", "r.ufdio");
+ f5 = Fopen ("http://people.redhat.com/", "r");
if (f4) {
fprintf (stderr, "close http://www.wraptastic.org/\n");
@@ .
Received on Sun Jul 15 18:32:18 2007