lsm/mdbtools
1
0
Fork 0
mirror of https://github.com/mdbtools/mdbtools.git synced 2026-03-10 00:20:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of github.com:mdbtools/mdbtools into dev

Browse Source
This commit is contained in:
Evan Miller
2020-10-18 07:46:43 -04:00
parent 40d8b15c9e 73e0de306d
commit aac0a3d713
3 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/mdb-export.txt
View File

@@ -20,7 +20,7 @@ OPTIONS
-q, --quote char Use to wrap text-like fields. Default is " (double quote). -q, --quote char Use to wrap text-like fields. Default is " (double quote).
-X, --escape char Use to escape quoted characters within a field. Default is doubling. -X, --escape char Use to escape quoted characters within a field. Default is doubling.
-N, --namespace prefix Prefix identifiers with prefix. -N, --namespace prefix Prefix identifiers with prefix.
-b --bin strip|raw|octal|hex Binary export mode: strip binaries, export as-is, output \ooo style octal data or output \xx style hexadecimal data. -b, --bin strip|raw|octal|hex Binary export mode: strip binaries, export as-is, output \ooo style octal data or output \xx style hexadecimal data.
NOTES NOTES

27
src/sql/mdbsql.c
View File

@@ -161,12 +161,26 @@ MdbHandle *mdb_sql_open(MdbSQL *sql, char *db_name)
#ifdef HAVE_WORDEXP #ifdef HAVE_WORDEXP
wordexp_t words; wordexp_t words;
int need_free_words = 0;
if (wordexp(db_name, &words, 0)==0) { switch (wordexp(db_name, &words, 0))
if (words.we_wordc>0) {
db_namep = words.we_wordv[0]; case 0:
if (words.we_wordc>0)
{
db_namep = words.we_wordv[0];
}
need_free_words = 1;
break;
case WRDE_NOSPACE:
// If the error was WRDE_NOSPACE, then perhaps part of the result was allocated.
need_free_words = 1;
break;
default:
// Some other error
need_free_words = 0;
break;
} }
#endif #endif
sql->mdb = mdb_open(db_namep, MDB_NOFLAGS); sql->mdb = mdb_open(db_namep, MDB_NOFLAGS);
@@ -180,7 +194,10 @@ MdbHandle *mdb_sql_open(MdbSQL *sql, char *db_name)
} }
#ifdef HAVE_WORDEXP #ifdef HAVE_WORDEXP
wordfree(&words); if ( need_free_words )
{
wordfree(&words);
}
#endif #endif
return sql->mdb; return sql->mdb;

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

@@ -89,7 +89,7 @@ int main (int argc, char **argv) {
fprintf (stderr, "Usage: %s [options] <database filename> <query name>\n",argv[0]); fprintf (stderr, "Usage: %s [options] <database filename> <query name>\n",argv[0]);
fprintf (stderr, "where options are:\n"); fprintf (stderr, "where options are:\n");
fprintf (stderr, " -L\t\t\tList queries in the database (default if no query name is passed)\n"); fprintf (stderr, " -L\t\t\tList queries in the database (default if no query name is passed)\n");
fprintf (stderr, " -1\t\t\tUse newline as the delimiter (used in conjuction with listing)\n"); 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"); fprintf (stderr, " -d <delimiter>\tSpecify delimiter to use\n");
exit (1); exit (1);
} }