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 17:57:50 Branch: HEAD Handle: 2010041215574900 Modified files: rpm/rpmio rpmsql.c Log: - rpmsql: WIP. Summary: Revision Changes Path 2.26 +8 -6 rpm/rpmio/rpmsql.c ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/rpmio/rpmsql.c ============================================================================ $ cvs diff -u -r2.25 -r2.26 rpmsql.c --- rpm/rpmio/rpmsql.c 12 Apr 2010 15:51:46 -0000 2.25 +++ rpm/rpmio/rpmsql.c 12 Apr 2010 15:57:49 -0000 2.26 @@ -2384,24 +2384,26 @@ * string, then issue a continuation prompt. * @param sql sql interpreter */ -static char *rpmsqlInputOneLine(rpmsql sql, const char *zPrior, FILE * ifp) +static char *rpmsqlInputOneLine(rpmsql sql, const char *zPrior) { +FILE * ifp; const char *zPrompt; char *zResult; -SQLDBG((stderr, "--> %s(%s,%p)\n", __FUNCTION__, zPrior, ifp)); +SQLDBG((stderr, "--> %s(%s)\n", __FUNCTION__, zPrior)); assert(sql->buf == NULL); sql->nbuf = BUFSIZ; sql->buf = xmalloc(sql->nbuf); - if (ifp != NULL) { assert(sql->ifd != NULL); +ifp = fdGetFILE(sql->ifd); assert(sql->ifp == ifp); + + if (ifp != NULL) { zResult = local_getline(sql, NULL); } else { zPrompt = (zPrior && zPrior[0]) ? sql->zContinue : sql->zPrompt; -assert(sql->ifp != NULL); zResult = readline(sql, zPrompt); #if defined(HAVE_READLINE) && HAVE_READLINE==1 if (zResult && *zResult) @@ -2412,7 +2414,7 @@ sql->buf = _free(sql->buf); sql->nbuf = 0; -SQLDBG((stderr, "<-- %s(%s,%p)\n", __FUNCTION__, zPrior, ifp)); +SQLDBG((stderr, "<-- %s(%s)\n", __FUNCTION__, zPrior)); return zResult; } @@ -3785,7 +3787,7 @@ { if (sql->ofd) Fflush(sql->ofd); zLine = _free(zLine); - zLine = rpmsqlInputOneLine(sql, zSql, ifp); + zLine = rpmsqlInputOneLine(sql, zSql); if (zLine == 0) break; /* We have reached EOF */ if (_rpmsqlSeenInterrupt) { @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository [email protected]
