skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Rename env vars to make it clear they are for the mpw binary, add PATH support for askpass.

Browse Source
This commit is contained in:
Maarten Billemont 2017-08-31 13:42:03 -04:00
parent 019cefd3fb
commit ba24c2be34
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
platform-independent/cli-c/cli/mpw-cli.c
View File

@ -20,9 +20,10 @@
#ifndef MP_VERSION #ifndef MP_VERSION
#define MP_VERSION ? #define MP_VERSION ?
#endif #endif
#define MP_ENV_fullName "MP_FULLNAME" #define MP_ENV_fullName "MPW_FULLNAME"
#define MP_ENV_algorithm "MP_ALGORITHM" #define MP_ENV_algorithm "MPW_ALGORITHM"
#define MP_ENV_format "MP_FORMAT" #define MP_ENV_format "MPW_FORMAT"
#define MP_ENV_askpass "MPW_ASKPASS"
/** Output the program's usage documentation. */ /** Output the program's usage documentation. */
static void usage() { static void usage() {
@ -104,8 +105,9 @@ static void usage() {
"ENVIRONMENT\n\n" "ENVIRONMENT\n\n"
" %-12s The full name of the user (see -u).\n" " %-12s The full name of the user (see -u).\n"
" %-12s The default algorithm version (see -a).\n" " %-12s The default algorithm version (see -a).\n"
" %-12s The default mpsites format (see -f).\n\n", " %-12s The default mpsites format (see -f).\n"
MP_ENV_fullName, MP_ENV_algorithm, MP_ENV_format ); " %-12s The askpass program to use for prompting the user.\n\n",
MP_ENV_fullName, MP_ENV_algorithm, MP_ENV_format, MP_ENV_askpass );
exit( 0 ); exit( 0 );
} }
@ -124,7 +126,7 @@ char *mpw_read_file(FILE *file);
* @return A newly allocated string or NULL if askpass is not supported or an error occurred. */ * @return A newly allocated string or NULL if askpass is not supported or an error occurred. */
static char *mpw_askpass(const char *prompt) { static char *mpw_askpass(const char *prompt) {
const char *askpass = mpw_getenv( "MPW_ASKPASS" ); const char *askpass = mpw_getenv( MP_ENV_askpass );
if (!askpass) if (!askpass)
return NULL; return NULL;
@ -146,7 +148,7 @@ static char *mpw_askpass(const char *prompt) {
if (dup2( pipes[1], STDOUT_FILENO ) == ERR) if (dup2( pipes[1], STDOUT_FILENO ) == ERR)
ftl( "Couldn't connect pipe to process: %s\n", strerror( errno ) ); ftl( "Couldn't connect pipe to process: %s\n", strerror( errno ) );
else if (execl( askpass, askpass, prompt, NULL ) == ERR) else if (execlp( askpass, askpass, prompt, NULL ) == ERR)
ftl( "Couldn't execute askpass:\n %s: %s\n", askpass, strerror( errno ) ); ftl( "Couldn't execute askpass:\n %s: %s\n", askpass, strerror( errno ) );
exit( EX_SOFTWARE ); exit( EX_SOFTWARE );