folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCP: Fix help for DEL/RM command and use unlink() instead of remove()

Browse source 
remove()'s behavior was extended to perform either a unlink() and if
that failed, a rmdir().  This is not consistent with the native commands
del or rm since they only remove a file but not a directory.
This commit is contained in:
Mark Pizzolato 2017-02-17 00:11:16 -08:00
parent f07987b7cd
commit ed8a288583
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
scp.c
View file

@ -1023,10 +1023,10 @@ static const char simh_help[] =
#define HLP_CAT "*Commands Displaying_Files CAT" #define HLP_CAT "*Commands Displaying_Files CAT"
"3CAT\n" "3CAT\n"
"++CAT {file} display a file contents\n" "++CAT {file} display a file contents\n"
#define HLP_DEL "*Commands Displaying_Files CAT" #define HLP_DELETE "*Commands Removing_Files DEL"
"3DEL\n" "3DELETE\n"
"++DEL {file} deletes a file\n" "++DEL{ete} {file} deletes a file\n"
#define HLP_RM "*Commands Displaying_Files CAT" #define HLP_RM "*Commands Removing_Files RM"
"3RM\n" "3RM\n"
"++RM {file} deletes a file\n" "++RM {file} deletes a file\n"
#define HLP_SET "*Commands SET" #define HLP_SET "*Commands SET"
@ -1827,7 +1827,7 @@ static CTAB cmd_table[] = {
{ "LS", &dir_cmd, 0, HLP_LS }, { "LS", &dir_cmd, 0, HLP_LS },
{ "TYPE", &type_cmd, 0, HLP_TYPE }, { "TYPE", &type_cmd, 0, HLP_TYPE },
{ "CAT", &type_cmd, 0, HLP_CAT }, { "CAT", &type_cmd, 0, HLP_CAT },
{ "DEL", &delete_cmd, 0, HLP_DEL }, { "DELETE", &delete_cmd, 0, HLP_DELETE },
{ "RM", &delete_cmd, 0, HLP_RM }, { "RM", &delete_cmd, 0, HLP_RM },
{ "SET", &set_cmd, 0, HLP_SET }, { "SET", &set_cmd, 0, HLP_SET },
{ "SHOW", &show_cmd, 0, HLP_SHOW }, { "SHOW", &show_cmd, 0, HLP_SHOW },
@ -5232,7 +5232,7 @@ if ((!cptr) || (*cptr == 0))
lbuf[sizeof(lbuf)-1] = '\0'; lbuf[sizeof(lbuf)-1] = '\0';
strncpy (lbuf, cptr, sizeof(lbuf)-1); strncpy (lbuf, cptr, sizeof(lbuf)-1);
sim_trim_endspc(lbuf); sim_trim_endspc(lbuf);
if (!remove (lbuf)) if (!unlink (lbuf))
return SCPE_OK; return SCPE_OK;
return sim_messagef (SCPE_ARG, "%s\n", strerror (errno)); return sim_messagef (SCPE_ARG, "%s\n", strerror (errno));
} }