skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Fix chdir test & make curses work when stdout is redirected.

Browse Source
This commit is contained in:
Maarten Billemont 2017-10-06 14:59:29 -04:00
parent 7150f2f5c5
commit f8043ae16d
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
platform-independent/cli-c/cli/mpw-cli-util.c
View File

@ -103,7 +103,7 @@ static const char *_mpw_getline(const char *prompt, bool silent) {
#if MPW_COLOR #if MPW_COLOR
// Initialize a curses screen. // Initialize a curses screen.
initscr(); SCREEN *screen = newterm( NULL, stderr, stdin );
start_color(); start_color();
init_pair( 1, COLOR_WHITE, COLOR_BLUE ); init_pair( 1, COLOR_WHITE, COLOR_BLUE );
init_pair( 2, COLOR_BLACK, COLOR_WHITE ); init_pair( 2, COLOR_BLACK, COLOR_WHITE );
@ -144,6 +144,7 @@ static const char *_mpw_getline(const char *prompt, bool silent) {
} }
attrset( 0 ); attrset( 0 );
endwin(); endwin();
delscreen( screen );
return result == ERR? NULL: mpw_strndup( str, MPW_MAX_INPUT ); return result == ERR? NULL: mpw_strndup( str, MPW_MAX_INPUT );
#else #else
@ -223,17 +224,17 @@ bool mpw_mkdirs(const char *filePath) {
// Save the cwd and for absolute paths, start at the root. // Save the cwd and for absolute paths, start at the root.
char *cwd = getcwd( NULL, 0 ); char *cwd = getcwd( NULL, 0 );
if (*filePath == '/') if (*filePath == '/')
if (!chdir( "/" )) if (chdir( "/" ) == ERR)
return false; return false;
// The path to mkdir is the filePath without the last path component. // The path to mkdir is the filePath without the last path component.
char *pathEnd = strrchr( filePath, '/' ); char *pathEnd = strrchr( filePath, '/' );
char *path = pathEnd? mpw_strndup( filePath, (size_t)(pathEnd - filePath) ): NULL; if (pathEnd)
if (!path) return true;
return false;
// Walk the path. // Walk the path.
bool success = true; bool success = true;
char *path = mpw_strndup( filePath, (size_t)(pathEnd - filePath) );
for (char *dirName = strtok( path, "/" ); success && dirName; dirName = strtok( NULL, "/" )) { for (char *dirName = strtok( path, "/" ); success && dirName; dirName = strtok( NULL, "/" )) {
if (!strlen( dirName )) if (!strlen( dirName ))
continue; continue;