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: 04-Aug-2013 23:40:22
Branch: rpm-5_4 Handle: 2013080421402200
Modified files: (Branch: rpm-5_4)
rpm/rpmio rpmcurl.c tmagic.c tperl.c tput.c tpython.c ttcl.c
Log:
- rpmio: scrub out some bit rot in helper programs.
Summary:
Revision Changes Path
1.2.6.1 +4 -4 rpm/rpmio/rpmcurl.c
1.8.8.1 +14 -27 rpm/rpmio/tmagic.c
2.1.6.1 +2 -3 rpm/rpmio/tperl.c
1.6.8.1 +13 -30 rpm/rpmio/tput.c
2.1.6.1 +2 -3 rpm/rpmio/tpython.c
2.3.6.1 +2 -3 rpm/rpmio/ttcl.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmcurl.c
============================================================================
$ cvs diff -u -r1.2 -r1.2.6.1 rpmcurl.c
--- rpm/rpmio/rpmcurl.c 11 Apr 2009 16:50:24 -0000 1.2
+++ rpm/rpmio/rpmcurl.c 4 Aug 2013 21:40:22 -0000 1.2.6.1
@@ -78,7 +78,7 @@
{ "anyauth", '\0', POPT_ARG_VAL, &curlAuth, CURL_AUTH_ANY,
N_("Pick \"any\" authentication method (H)"), NULL },
- { "append", 'a', POPT_BIT_TOGGLE, &curlFlags, CURL_FLAGS_APPEND,
+ { "append", 'a', POPT_ARGFLAG_TOGGLE, &curlFlags, CURL_FLAGS_APPEND,
N_("Append to target file when uploading (F)"), NULL },
{ "basic", '\0', POPT_ARG_VAL, &curlAuth, CURL_AUTH_BASIC,
N_("Use HTTP Basic Authentication (H)"), NULL },
@@ -94,7 +94,7 @@
/* XXX ARGV */
{ "ciphers", '\0', POPT_ARG_STRING, &_ciphers, 0,
N_("<list> SSL ciphers to use (SSL)"), NULL },
- { "compressed", '\0', POPT_BIT_TOGGLE,&curlFlags, CURL_FLAGS_COMPRESSED,
+ { "compressed", '\0', POPT_ARGFLAG_TOGGLE,&curlFlags,
CURL_FLAGS_COMPRESSED,
N_("Request compressed response (using deflate or gzip)"), NULL },
{ "config", 'K', POPT_ARG_NONE, NULL, 'K',
N_("Specify which config file to read"), NULL },
@@ -108,7 +108,7 @@
N_("Cookie string or file to read cookies from (H)"),
N_("<name=string/file>") },
{ "cookie-jar", 'c', POPT_ARG_STRING, &_cookie_jar, 0,
N_("Write cookies to this file after operation (H)"), N_("<file>") },
- { "create-dirs", '\0', POPT_BIT_TOGGLE, &curlFlags,
CURL_FLAGS_CREATEDIRS,
+ { "create-dirs", '\0', POPT_ARGFLAG_TOGGLE, &curlFlags,
CURL_FLAGS_CREATEDIRS,
N_("Create necessary local directory hierarchy"), NULL },
{ "crlf", '\0', POPT_BIT_SET, &curlFlags, CURL_FLAGS_CRLF,
N_("Convert LF to CRLF in upload"), NULL },
@@ -322,7 +322,7 @@
N_("Transfer <file> to remote site"), N_("<file>") },
{ "url", '\0', POPT_ARG_NONE, NULL, POPTCURL_XXX,
N_("Set URL to work with"), N_("<URL>") },
- { "use-ascii", 'B', POPT_BIT_TOGGLE, &curlFlags, CURL_FLAGS_ASCII,
+ { "use-ascii", 'B', POPT_ARGFLAG_TOGGLE, &curlFlags, CURL_FLAGS_ASCII,
N_("Use ASCII/text transfer"), NULL },
{ "user", 'u', POPT_ARG_NONE, NULL, 'u',
N_("Set server user and password"), N_("<user[:password]>") },
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/tmagic.c
============================================================================
$ cvs diff -u -r1.8 -r1.8.8.1 tmagic.c
--- rpm/rpmio/tmagic.c 2 Feb 2008 01:46:05 -0000 1.8
+++ rpm/rpmio/tmagic.c 4 Aug 2013 21:40:22 -0000 1.8.8.1
@@ -1,13 +1,14 @@
#include "system.h"
#include "magic.h"
-#define _RPMMG_INTERNAL
-#include <rpmmg.h>
-#include <rpmio_internal.h>
+#include <rpmio.h>
#include <rpmmacro.h>
#include <rpmcb.h>
-#include <popt.h>
+#include <poptIO.h>
+
+#define _RPMMG_INTERNAL
+#include <rpmmg.h>
#include "debug.h"
@@ -35,14 +36,11 @@
}
static struct poptOption optionsTable[] = {
- { "debug", 'd', POPT_ARG_VAL, &_rpmmg_debug, -1, NULL,
NULL },
- { "ftpdebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_ftp_debug, -1,
- N_("debug protocol data stream"), NULL},
- { "rpmiodebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_rpmio_debug,
-1,
- N_("debug rpmio I/O"), NULL},
- { "urldebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_url_debug, -1,
- N_("debug URL cache handling"), NULL},
- { "verbose", 'v', 0, 0, 'v', NULL, NULL },
+
+ { NULL, '\0', POPT_ARG_INCLUDE_TABLE, rpmioAllPoptTable, 0,
+ N_("Common options for all rpmio executables:"),
+ NULL },
+
POPT_AUTOHELP
POPT_TABLEEND
};
@@ -50,20 +48,9 @@
int
main(int argc, char *argv[])
{
- poptContext optCon = poptGetContext(argv[0], argc, argv, optionsTable,
0);
+ poptContext optCon = rpmioInit(argc, argv, optionsTable);
rpmmg mg;
- int rc;
-
- while ((rc = poptGetNextOpt(optCon)) > 0) {
- switch (rc) {
- case 'v':
- rpmIncreaseVerbosity();
- /*@switchbreak@*/ break;
- default:
- /*@switchbreak@*/ break;
- }
- }
-
+ int rc = 0;
_rpmmg_debug = -1;
if (_rpmmg_debug) {
@@ -75,7 +62,7 @@
readFile(mg, fnpath);
mg = rpmmgFree(mg);
-/*@i@*/ urlFreeCache();
+ optCon = rpmioFini(optCon);
- return 0;
+ return rc;
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/tperl.c
============================================================================
$ cvs diff -u -r2.1 -r2.1.6.1 tperl.c
--- rpm/rpmio/tperl.c 7 Apr 2009 17:17:21 -0000 2.1
+++ rpm/rpmio/tperl.c 4 Aug 2013 21:40:22 -0000 2.1.6.1
@@ -24,11 +24,10 @@
main(int argc, char *argv[])
{
poptContext optCon = rpmioInit(argc, argv, optionsTable);
- const char * perlFN = NULL;
- int perlFlags = 0;
- rpmperl perl = rpmperlNew(perlFN, perlFlags);
ARGV_t av = poptGetArgs(optCon);
int ac = argvCount(av);
+ int perlFlags = 0;
+ rpmperl perl = rpmperlNew((char **)av, perlFlags);
#ifdef NOTYET
const char * fn;
#endif
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/tput.c
============================================================================
$ cvs diff -u -r1.6 -r1.6.8.1 tput.c
--- rpm/rpmio/tput.c 2 Feb 2008 01:46:05 -0000 1.6
+++ rpm/rpmio/tput.c 4 Aug 2013 21:40:22 -0000 1.6.8.1
@@ -1,9 +1,12 @@
#include "system.h"
-#include <rpmio_internal.h>
+#include <rpmio.h>
+#include <rpmdir.h>
+#include <rpmdav.h>
#include <rpmmacro.h>
#include <rpmcb.h>
-#include <popt.h>
+#include <poptIO.h>
+#include <argv.h>
#include "debug.h"
@@ -105,16 +108,11 @@
}
static struct poptOption optionsTable[] = {
- { "debug", 'd', POPT_ARG_VAL, &_debug, -1, NULL, NULL },
- { "ftpdebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_ftp_debug, -1,
- N_("debug protocol data stream"), NULL},
- { "noneon", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &noNeon, 1,
- N_("disable use of libneon for HTTP"), NULL},
- { "rpmiodebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_rpmio_debug,
-1,
- N_("debug rpmio I/O"), NULL},
- { "urldebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_url_debug, -1,
- N_("debug URL cache handling"), NULL},
- { "verbose", 'v', 0, 0, 'v', NULL, NULL },
+
+ { NULL, '\0', POPT_ARG_INCLUDE_TABLE, rpmioAllPoptTable, 0,
+ N_("Common options for all rpmio executables:"),
+ NULL },
+
POPT_AUTOHELP
POPT_TABLEEND
};
@@ -122,23 +120,8 @@
int
main(int argc, char *argv[])
{
- poptContext optCon = poptGetContext(argv[0], argc, argv, optionsTable,
0);
- int rc;
-
- while ((rc = poptGetNextOpt(optCon)) > 0) {
- switch (rc) {
- case 'v':
- rpmIncreaseVerbosity();
- /*@switchbreak@*/ break;
- default:
- /*@switchbreak@*/ break;
- }
- }
-
- if (_debug) {
- rpmIncreaseVerbosity();
- rpmIncreaseVerbosity();
- }
+ poptContext optCon = rpmioInit(argc, argv, optionsTable);
+ int rc = 0;
_av_debug = -1;
_ftp_debug = -1;
@@ -152,7 +135,7 @@
doFile(httpspath);
#endif
-/*@i@*/ urlFreeCache();
+ optCon = rpmioFini(optCon);
return 0;
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/tpython.c
============================================================================
$ cvs diff -u -r2.1 -r2.1.6.1 tpython.c
--- rpm/rpmio/tpython.c 7 Apr 2009 22:57:48 -0000 2.1
+++ rpm/rpmio/tpython.c 4 Aug 2013 21:40:22 -0000 2.1.6.1
@@ -22,11 +22,10 @@
main(int argc, char *argv[])
{
poptContext optCon = rpmioInit(argc, argv, optionsTable);
- const char * pythonFN = NULL;
- int pythonFlags = 0;
- rpmpython python = rpmpythonNew(pythonFN, pythonFlags);
ARGV_t av = poptGetArgs(optCon);
int ac = argvCount(av);
+ int pythonFlags = 0;
+ rpmpython python = rpmpythonNew((char **)av, pythonFlags);
const char * fn;
int rc = 1; /* assume failure */
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/ttcl.c
============================================================================
$ cvs diff -u -r2.3 -r2.3.6.1 ttcl.c
--- rpm/rpmio/ttcl.c 7 Apr 2009 22:57:48 -0000 2.3
+++ rpm/rpmio/ttcl.c 4 Aug 2013 21:40:22 -0000 2.3.6.1
@@ -22,11 +22,10 @@
main(int argc, char *argv[])
{
poptContext optCon = rpmioInit(argc, argv, optionsTable);
- const char * tclFN = NULL;
- int tclFlags = 0;
- rpmtcl tcl = rpmtclNew(tclFN, tclFlags);
ARGV_t av = poptGetArgs(optCon);
int ac = argvCount(av);
+ int tclFlags = 0;
+ rpmtcl tcl = rpmtclNew((char **)av, tclFlags);
const char * fn;
int rc = 1; /* assume failure */
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
