DeforaOS/libDatabase
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use PROGNAME_DATABASE for database(1)

Browse Source
This commit is contained in:
Pierre Pronchery 2020-02-23 20:13:01 +01:00
parent 081cb1a66c
commit 28199cf6d3
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tools/database.c
View File

@ -20,8 +20,8 @@
#include <System.h> #include <System.h>
#include "Database.h" #include "Database.h"
#ifndef PROGNAME #ifndef PROGNAME_DATABASE
# define PROGNAME "database" # define PROGNAME_DATABASE "database"
#endif #endif
@ -60,7 +60,7 @@ static int _database(char const * engine, char const * cfile,
if((db = _database_load(engine, cfile, section)) == NULL) if((db = _database_load(engine, cfile, section)) == NULL)
{ {
error_print(PROGNAME); error_print(PROGNAME_DATABASE);
return 2; return 2;
} }
database.fp = stdout; database.fp = stdout;
@ -71,7 +71,7 @@ static int _database(char const * engine, char const * cfile,
/* XXX it may not have picked a complete line */ /* XXX it may not have picked a complete line */
if(database_query(db, buf, _database_print, &database) != 0) if(database_query(db, buf, _database_print, &database) != 0)
{ {
error_print(PROGNAME); error_print(PROGNAME_DATABASE);
continue; continue;
} }
fprintf(database.fp, "(%u rows)\n", database.rows); fprintf(database.fp, "(%u rows)\n", database.rows);
@ -134,7 +134,7 @@ static int _database_query(char const * engine, char const * cfile,
if((db = _database_load(engine, cfile, section)) == NULL) if((db = _database_load(engine, cfile, section)) == NULL)
{ {
error_print(PROGNAME); error_print(PROGNAME_DATABASE);
return 2; return 2;
} }
database.fp = stdout; database.fp = stdout;
@ -142,7 +142,7 @@ static int _database_query(char const * engine, char const * cfile,
database.rows = 0; database.rows = 0;
if((ret = database_query(db, query, _database_print, &database)) != 0) if((ret = database_query(db, query, _database_print, &database)) != 0)
{ {
error_print(PROGNAME); error_print(PROGNAME_DATABASE);
return ret; return ret;
} }
printf("(%u rows)\n", database.rows); printf("(%u rows)\n", database.rows);
@ -154,7 +154,8 @@ static int _database_query(char const * engine, char const * cfile,
/* usage */ /* usage */
static int _usage(void) static int _usage(void)
{ {
fputs("Usage: " PROGNAME " -d engine [-C configuration [-S section]][query]\n" fputs("Usage: " PROGNAME_DATABASE
" -d engine [-C configuration [-S section]][query]\n"
" -d Database engine to load\n" " -d Database engine to load\n"
" -C Connection file to load\n" " -C Connection file to load\n"
" -S Section of the connection file to use\n", " -S Section of the connection file to use\n",