Menu
▾
▴
[mdb-dev] Small cleanup for cmdline args
|
From: Michael W. <wo...@ki...> - 2000-04-17 15:43:47
|
Hi
Here's a small cleanup for command line arguments of the tools.
Index: src/extras/dump.c
===================================================================
RCS file: /cvsroot/mdbtools/mdbtools/src/extras/dump.c,v
retrieving revision 1.2
diff -u -r1.2 dump.c
--- src/extras/dump.c 2000/03/03 01:50:08 1.2
+++ src/extras/dump.c 2000/04/17 15:10:38
@@ -21,7 +21,14 @@
int pg=0;
char addr[10];
- in = fopen(argv[1],"r");
+ if (argc != 2) {
+ fprintf(stderr, "Usage: %s <file>\n", argv[0]);
+ exit(1);
+ }
+ if ((in = fopen(argv[1],"r")) == NULL) {
+ perror(argv[1]);
+ exit(1);
+ }
while (length = fread(data,1,16,in)) {
sprintf(addr, "%06x", i);
if (!strcmp(&addr[3],"000") || ! strcmp(&addr[3],"800")) {
Index: src/util/header.c
===================================================================
RCS file: /cvsroot/mdbtools/mdbtools/src/util/header.c,v
retrieving revision 1.2
diff -u -r1.2 header.c
--- src/util/header.c 2000/04/02 17:08:30 1.2
+++ src/util/header.c 2000/04/17 15:10:38
@@ -40,7 +40,7 @@
FILE *headerfile;
FILE *cfile;
- if (argc < 2) {
+ if (argc != 2) {
fprintf (stderr, "Usage: %s <file>\n",argv[0]);
exit (1);
}
@@ -49,9 +49,10 @@
/* open the database */
- mdb = mdb_open (argv[1]);
- if (!mdb) {
- mdb_exit();
+ if ((mdb = mdb_open(argv[1])) == NULL) {
+ fprintf(stderr, "Could not open database %s\n",
+ argv[1]);
+ mdb_exit();
exit(1);
}
Index: src/util/mdb-array.c
===================================================================
RCS file: /cvsroot/mdbtools/mdbtools/src/util/mdb-array.c,v
retrieving revision 1.2
diff -u -r1.2 mdb-array.c
--- src/util/mdb-array.c 2000/04/10 01:20:43 1.2
+++ src/util/mdb-array.c 2000/04/17 15:10:38
@@ -39,14 +39,19 @@
int count;
int started;
- if (argc < 2)
+ if (argc != 3)
{
fprintf (stderr, "Usage: %s <file> <table>\n", argv [0]);
exit (1);
}
mdb_init();
- mdb = mdb_open (argv [1]);
+ if ((mdb = mdb_open(argv[1])) == NULL) {
+ fprintf(stderr, "Could not open database %s\n",
+ argv[1]);
+ mdb_exit();
+ exit(1);
+ }
mdb_read_catalog (mdb, MDB_TABLE);
Index: src/util/mdb-export.c
===================================================================
RCS file: /cvsroot/mdbtools/mdbtools/src/util/mdb-export.c,v
retrieving revision 1.5
diff -u -r1.5 mdb-export.c
--- src/util/mdb-export.c 2000/04/10 01:20:43 1.5
+++ src/util/mdb-export.c 2000/04/17 15:10:38
@@ -35,14 +35,19 @@
char header_row = 1;
char quote_text = 1;
- if (argc<2) {
+ if (argc != 3) {
fprintf(stderr,"Usage: %s <file> <table>\n",argv[0]);
exit(1);
}
mdb_init();
- mdb = mdb_open(argv[1]);
+ if ((mdb = mdb_open(argv[1])) == NULL) {
+ fprintf(stderr, "Could not open database %s\n",
+ argv[1]);
+ mdb_exit();
+ exit(1);
+ }
mdb_read_catalog(mdb, MDB_TABLE);
Index: src/util/parsecsv.c
===================================================================
RCS file: /cvsroot/mdbtools/mdbtools/src/util/parsecsv.c,v
retrieving revision 1.2
diff -u -r1.2 parsecsv.c
--- src/util/parsecsv.c 2000/03/19 02:50:05 1.2
+++ src/util/parsecsv.c 2000/04/17 15:10:38
@@ -50,7 +50,7 @@
int lastcomma;
int i;
- if (argc < 2)
+ if (argc != 2)
{
fprintf (stderr, "Usage: %s <file> (assumed extension .txt)\n",argv[0]);
exit (1);
Index: src/util/prcat.c
===================================================================
RCS file: /cvsroot/mdbtools/mdbtools/src/util/prcat.c,v
retrieving revision 1.6
diff -u -r1.6 prcat.c
--- src/util/prcat.c 2000/04/02 17:08:30 1.6
+++ src/util/prcat.c 2000/04/17 15:10:38
@@ -30,14 +30,19 @@
MdbHandle *mdb;
- if (argc<2) {
+ if (argc < 2 || argc > 3) {
fprintf(stderr,"Usage: %s <file> [<objtype>]\n",argv[0]);
exit(1);
}
mdb_init();
- mdb = mdb_open(argv[1]);
+ if ((mdb = mdb_open(argv[1])) == NULL) {
+ fprintf(stderr, "Could not open database %s\n",
+ argv[1]);
+ mdb_exit();
+ exit(1);
+ }
mdb_dump_catalog(mdb,(argc > 2) ? atoi(argv[2]) : MDB_TABLE);
Index: src/util/prdata.c
===================================================================
RCS file: /cvsroot/mdbtools/mdbtools/src/util/prdata.c,v
retrieving revision 1.4
diff -u -r1.4 prdata.c
--- src/util/prdata.c 2000/04/10 01:20:43 1.4
+++ src/util/prdata.c 2000/04/17 15:10:38
@@ -31,13 +31,18 @@
GList *l;
- if (argc<2) {
+ if (argc != 3) {
fprintf(stderr,"Usage: %s <file> <table>\n",argv[0]);
exit(1);
}
mdb_init();
- mdb = mdb_open(argv[1]);
+ if ((mdb = mdb_open(argv[1])) == NULL) {
+ fprintf(stderr, "Could not open database %s\n",
+ argv[1]);
+ mdb_exit();
+ exit(1);
+ }
mdb_read_catalog(mdb, MDB_TABLE);
Index: src/util/prdump.c
===================================================================
RCS file: /cvsroot/mdbtools/mdbtools/src/util/prdump.c,v
retrieving revision 1.3
diff -u -r1.3 prdump.c
--- src/util/prdump.c 2000/04/02 17:08:30 1.3
+++ src/util/prdump.c 2000/04/17 15:10:38
@@ -32,13 +32,18 @@
int j;
int page, start, stop;
- if (argc<4) {
+ if (argc != 5) {
fprintf(stderr,"Usage: %s <file> <page> <start> <stop>\n",argv[0]);
exit(1);
}
mdb_init();
- mdb = mdb_open(argv[1]);
+ if ((mdb = mdb_open(argv[1])) == NULL) {
+ fprintf(stderr, "Could not open database %s\n",
+ argv[1]);
+ mdb_exit();
+ exit(1);
+ }
mdb_read_catalog(mdb, MDB_TABLE);
Index: src/util/prkkd.c
===================================================================
RCS file: /cvsroot/mdbtools/mdbtools/src/util/prkkd.c,v
retrieving revision 1.3
diff -u -r1.3 prkkd.c
--- src/util/prkkd.c 2000/04/02 17:08:30 1.3
+++ src/util/prkkd.c 2000/04/17 15:10:38
@@ -27,13 +27,18 @@
MdbCatalogEntry entry;
- if (argc<2) {
+ if (argc != 3) {
fprintf(stderr,"Usage: %s <file> <table>\n",argv[0]);
exit(1);
}
mdb_init();
- mdb = mdb_open(argv[1]);
+ if ((mdb = mdb_open(argv[1])) == NULL) {
+ fprintf(stderr, "Could not open database %s\n",
+ argv[1]);
+ mdb_exit();
+ exit(1);
+ }
mdb_read_pg(mdb, MDB_CATALOG_PG);
rows = mdb_catalog_rows(mdb);
Index: src/util/prtable.c
===================================================================
RCS file: /cvsroot/mdbtools/mdbtools/src/util/prtable.c,v
retrieving revision 1.6
diff -u -r1.6 prtable.c
--- src/util/prtable.c 2000/04/07 00:48:48 1.6
+++ src/util/prtable.c 2000/04/17 15:10:38
@@ -30,13 +30,18 @@
GList *l;
- if (argc<3) {
+ if (argc != 3) {
fprintf(stderr,"Usage: %s <file> <table>\n",argv[0]);
exit(1);
}
mdb_init();
- mdb = mdb_open(argv[1]);
+ if ((mdb = mdb_open(argv[1])) == NULL) {
+ fprintf(stderr, "Could not open database %s\n",
+ argv[1]);
+ mdb_exit();
+ exit(1);
+ }
mdb_read_catalog(mdb, MDB_TABLE);
Index: src/util/schema.c
===================================================================
RCS file: /cvsroot/mdbtools/mdbtools/src/util/schema.c,v
retrieving revision 1.4
diff -u -r1.4 schema.c
--- src/util/schema.c 2000/04/02 17:08:30 1.4
+++ src/util/schema.c 2000/04/17 15:10:38
@@ -28,7 +28,7 @@
MdbTableDef *table;
MdbColumn *col;
- if (argc < 2) {
+ if (argc < 2 || argc > 3) {
fprintf (stderr, "Usage: %s <file> [<backend>]\n",argv[0]);
exit (1);
}
@@ -37,7 +37,12 @@
/* open the database */
- mdb = mdb_open (argv[1]);
+ if ((mdb = mdb_open(argv[1])) == NULL) {
+ fprintf(stderr, "Could not open database %s\n",
+ argv[1]);
+ mdb_exit();
+ exit(1);
+ }
if (argc>2) {
if (!mdb_set_default_backend(mdb, argv[2])) {
fprintf(stderr,"Invalid backend type\n");
Index: src/util/tables.c
===================================================================
RCS file: /cvsroot/mdbtools/mdbtools/src/util/tables.c,v
retrieving revision 1.2
diff -u -r1.2 tables.c
--- src/util/tables.c 2000/04/02 17:08:30 1.2
+++ src/util/tables.c 2000/04/17 15:10:38
@@ -28,7 +28,7 @@
MdbTableDef *table;
MdbColumn *col;
- if (argc < 2) {
+ if (argc != 2) {
fprintf (stderr, "Usage: %s <file>\n",argv[0]);
exit (1);
}
@@ -38,7 +38,12 @@
/* open the database */
- mdb = mdb_open (argv[1]);
+ if ((mdb = mdb_open(argv[1])) == NULL) {
+ fprintf(stderr, "Could not open database %s\n",
+ argv[1]);
+ mdb_exit();
+ exit(1);
+ }
/* read the catalog */
--
Michael Wood | Tel: +27 21 762 0276 | http://www.kingsley.co.za/
wo...@ki... | Fax: +27 21 761 9930 | Kingsley Technologies
|