lsm/mdbtools
1
0
Fork 0
mirror of https://github.com/mdbtools/mdbtools.git synced 2025-07-15 16:35:26 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Migrate mdb-queries over to the GLib machinery

Browse Source 
This buys us an auto-generated usage string and locale-awareness for the
query name. Short option names are preserved and long names are added.
This commit is contained in:
Evan Miller 2021-01-18 17:45:24 -05:00
parent 8fff5b0ac0
commit 1e35bddc62
1 changed files with 35 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/util/mdb-queries.c
View File

@ -47,8 +47,8 @@ int main (int argc, char **argv) {
int list_only=0; int list_only=0;
int found_match=0; int found_match=0;
int line_break=0; int line_break=0;
int opt;
char *query_id; char *query_id;
char *query_name = NULL;
size_t bind_size = QUERY_BIND_SIZE; size_t bind_size = QUERY_BIND_SIZE;
// variables for the msysqueries table // variables for the msysqueries table
@ -67,38 +67,44 @@ int main (int argc, char **argv) {
char *sql_where = malloc(bind_size); char *sql_where = malloc(bind_size);
char *sql_sorting = malloc(bind_size); char *sql_sorting = malloc(bind_size);
int flagint; int flagint;
char *locale = NULL;
/* see getopt(3) for more information on getopt and this will become clear */ GError *error = NULL;
while ((opt=getopt(argc, argv, "L1d:"))!=-1) { GOptionContext *opt_context;
switch (opt) {
case 'L':
list_only = 1;
break;
case '1':
line_break = 1;
break;
case 'd':
delimiter = g_strdup(optarg);
break;
}
}
/* we've parsed all the options and we should at least have a database name left */ GOptionEntry entries[] = {
if ((argc - optind) < 1) { {"list", 'L', 0, G_OPTION_ARG_NONE, &list_only, "List queries in the database (default if no query name is passed)", NULL},
fprintf (stderr, "Usage: %s [options] <database filename> <query name>\n",argv[0]); {"newline", '1', 0, G_OPTION_ARG_NONE, &line_break, "Use newline as the delimiter (used in conjunction with listing)", NULL},
fprintf (stderr, "where options are:\n"); {"delimiter", 'd', 0, G_OPTION_ARG_STRING, &delimiter, "Specify delimiter to use", "delimiter"},
fprintf (stderr, " -L\t\t\tList queries in the database (default if no query name is passed)\n"); {NULL}
fprintf (stderr, " -1\t\t\tUse newline as the delimiter (used in conjunction with listing)\n"); };
fprintf (stderr, " -d <delimiter>\tSpecify delimiter to use\n"); opt_context = g_option_context_new("<file> <query name> - list or export queries from an Access database");
g_option_context_add_main_entries(opt_context, entries, NULL /*i18n*/);
locale = setlocale(LC_CTYPE, "");
if (!g_option_context_parse (opt_context, &argc, &argv, &error))
{
fprintf(stderr, "option parsing failed: %s\n", error->message);
fputs(g_option_context_get_help(opt_context, TRUE, NULL), stderr);
exit (1); exit (1);
} }
/* let's turn list_only on if only a database filename was passed */ /* let's turn list_only on if only a database filename was passed */
if((argc-optind) < 2) if(argc == 2) {
list_only=1; list_only=1;
} else if (argc == 3) {
query_name= g_locale_to_utf8(argv[2], -1, NULL, NULL, &error);
if (!query_name) {
fprintf(stderr, "argument parsing failed: %s\n", error->message);
exit(1);
}
} else {
fputs("Wrong number of arguments.\n\n", stderr);
fputs(g_option_context_get_help(opt_context, TRUE, NULL), stderr);
exit(1);
}
setlocale(LC_CTYPE, locale);
/* open the database */ /* open the database */
if (!(mdb = mdb_open(argv[optind],MDB_NOFLAGS))) { if (!(mdb = mdb_open(argv[1],MDB_NOFLAGS))) {
fprintf(stderr,"Couldn't open database.\n"); fprintf(stderr,"Couldn't open database.\n");
exit(1); exit(1);
} }
@ -120,7 +126,7 @@ int main (int argc, char **argv) {
for (i=0; i < mdb->num_catalog; i++) { for (i=0; i < mdb->num_catalog; i++) {
temp = g_ptr_array_index(mdb->catalog, i); temp = g_ptr_array_index(mdb->catalog, i);
if(strcmp(temp->object_name,argv[optind+1]) == 0) { if(strcmp(temp->object_name,query_name) == 0) {
entry = g_ptr_array_index(mdb->catalog,i); entry = g_ptr_array_index(mdb->catalog,i);
found_match=1; found_match=1;
} else if(strcmp(temp->object_name,"MSysQueries") == 0) { } else if(strcmp(temp->object_name,"MSysQueries") == 0) {
@ -217,15 +223,14 @@ int main (int argc, char **argv) {
} }
free(query_id); free(query_id);
} else { } else {
fprintf(stderr,"Couldn't locate the specified query: %s\n",argv[optind+1]); fprintf(stderr,"Couldn't locate the specified query: %s\n",query_name);
} }
} }
mdb_close(mdb); mdb_close(mdb);
g_free(query_name);
if(delimiter) free(delimiter); return 0;
exit(0);
} }
/**************************************************** /****************************************************