valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

Added patch 829954 from James Wilkinson

Browse source 
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@1431
This commit is contained in:
Peter Veenstra 2003-11-11 18:47:25 +00:00
parent fdc23c8e04
commit a03d87e551
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/shell/shell_cmds.cpp
View file

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/* $Id: shell_cmds.cpp,v 1.34 2003-10-21 18:18:01 qbix79 Exp $ */
/* $Id: shell_cmds.cpp,v 1.35 2003-11-11 18:47:25 qbix79 Exp $ */
#include <string.h>
@ -252,7 +252,7 @@ void DOS_Shell::CMD_DIR(char * args) {
char buffer[CROSS_LEN];
args = trim(args);
int argLen = strlen(args);
Bit32u argLen = strlen(args);
if (argLen == 0) {
strcpy(args,"*.*"); //no arguments.
} else {
@ -262,16 +262,22 @@ void DOS_Shell::CMD_DIR(char * args) {
case ':' : // handle C:, etc.
strcat(args,"*.*");
break;
case '*': // handle *, \*, C:\*, etc.
// (not ideal - could end up *.*.*, but that'll net the same result)
strcat(args,".*");
break;
default:
break;
}
}
args = ExpandDot(args,buffer);
if (!strrchr(args,'*') && !strrchr(args,'?')) {
Bit16u attribute=0;
if(DOS_GetFileAttr(args,&attribute) && (attribute&DOS_ATTR_DIRECTORY) ) {
strcat(args,"\\*.*"); // if no wildcard and a directory, get its files
}
}
if (!strrchr(args,'.')) {
strcat(args,".*"); // if no extension, get them all
}
/* Make a full path in the args */
if (!DOS_Canonicalize(args,path)) {
WriteOut(MSG_Get("SHELL_ILLEGAL_PATH"));