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: 12-Apr-2010 18:42:02 Branch: HEAD Handle: 2010041216420200 Modified files: rpm/rpmio rpmsql.c Log: - rpmsql: WIP. Summary: Revision Changes Path 2.30 +12 -13 rpm/rpmio/rpmsql.c ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/rpmio/rpmsql.c ============================================================================ $ cvs diff -u -r2.29 -r2.30 rpmsql.c --- rpm/rpmio/rpmsql.c 12 Apr 2010 16:25:55 -0000 2.29 +++ rpm/rpmio/rpmsql.c 12 Apr 2010 16:42:02 -0000 2.30 @@ -2816,7 +2816,7 @@ }; /* forward ref @*/ -static int rpmsqlInput(rpmsql sql, FD_t ifd); +static int rpmsqlInput(rpmsql sql); static int rpmsqlFOpen(const char * fn, FD_t *fdp) /*...@modifies *fdp @*/ @@ -3385,7 +3385,7 @@ rc = 1; } else { /* XXX .read assumes .echo off? */ - rc = rpmsqlInput(sql, sql->ifd); + rc = rpmsqlInput(sql); } if (sql->ifd) (void) Fclose(sql->ifd); sql->ifd = _ifd; @@ -3750,7 +3750,7 @@ * @param sql sql interpreter * @return the number of errors */ -static int rpmsqlInput(rpmsql sql, FD_t ifd) +static int rpmsqlInput(rpmsql sql) { sqlite3 * db = (sqlite3 *) sql->I; char *zLine = 0; @@ -3763,12 +3763,10 @@ int lineno = 0; int startline = 0; -SQLDBG((stderr, "--> %s(%p,%p)\n", __FUNCTION__, sql, ifd)); +SQLDBG((stderr, "--> %s(%p)\n", __FUNCTION__, sql)); if (_rpmsql_debug) rpmsqlDebugDump(sql); -assert(sql->ifd == ifd); - while (errCnt == 0 || !F_ISSET(sql, BAIL) || F_ISSET(sql, PROMPT)) { if (sql->ofd) Fflush(sql->ofd); @@ -3845,7 +3843,7 @@ } zLine = _free(zLine); -SQLDBG((stderr, "<-- %s(%p,%p) rc %d\n", __FUNCTION__, sql, ifd, errCnt)); +SQLDBG((stderr, "<-- %s(%p) rc %d\n", __FUNCTION__, sql, errCnt)); return errCnt; } @@ -3859,6 +3857,7 @@ */ static int rpmsqlInitRC(rpmsql sql, const char *sqliterc) { + FD_t _ifd; int rc = 0; SQLDBG((stderr, "--> %s(%p,%s)\n", __FUNCTION__, sql, sqliterc)); @@ -3866,15 +3865,15 @@ sqliterc = sql->zInitrc; if (sqliterc == NULL) return rc; -assert(sql->ifd == NULL); + _ifd = sql->ifd; sql->ifd = Fopen(sqliterc, "rb.fpio"); if (!(sql->ifd == NULL || Ferror(sql->ifd))) { if (F_ISSET(sql, INTERACTIVE)) rpmsql_error(0, "-- Loading resources from %s", sqliterc); - rc = rpmsqlInput(sql, sql->ifd); + rc = rpmsqlInput(sql); } if (sql->ifd) (void) Fclose(sql->ifd); - sql->ifd = NULL; + sql->ifd = _ifd; return rc; } @@ -4299,7 +4298,7 @@ assert(sql->ifd); sql->flags |= RPMSQL_FLAGS_PROMPT; - rc = rpmsqlInput(sql, sql->ifd); + rc = rpmsqlInput(sql); sql->flags &= ~RPMSQL_FLAGS_PROMPT; if (sql->ifd) (void) Fclose(sql->ifd); @@ -4326,7 +4325,7 @@ sql->ifd = Fdopen(fdDup(fileno(stdin)), "rb.fpio"); assert(sql->ifd); - rc = rpmsqlInput(sql, sql->ifd); + rc = rpmsqlInput(sql); if (sql->ifd) (void) Fclose(sql->ifd); sql->ifd = NULL; @@ -4341,7 +4340,7 @@ assert(sql->ifd == NULL); sql->ifd = Fopen(s, "rb.fpio"); if (!(sql->ifd == NULL || Ferror(sql->ifd))) { - rc = rpmsqlInput(sql, sql->ifd); + rc = rpmsqlInput(sql); } if (sql->ifd) (void) Fclose(sql->ifd); sql->ifd = NULL; @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository [email protected]
