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

Some more hints in CHDIR

Browse source 
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@2965
This commit is contained in:
Peter Veenstra 2007-08-12 19:16:09 +00:00
parent 0190a6e149
commit f8733e94cf
2 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/shell/shell.cpp
View file

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/* $Id: shell.cpp,v 1.86 2007-07-03 17:32:14 qbix79 Exp $ */
/* $Id: shell.cpp,v 1.87 2007-08-12 19:16:09 qbix79 Exp $ */
#include <stdlib.h>
#include <stdarg.h>
@ -439,6 +439,7 @@ void SHELL_Init() {
MSG_Add("SHELL_MISSING_PARAMETER","Required parameter missing.\n");
MSG_Add("SHELL_CMD_CHDIR_ERROR","Unable to change to: %s.\n");
MSG_Add("SHELL_CMD_CHDIR_HINT","To change to different drive type \033[31m%c:\033[0m\n");
MSG_Add("SHELL_CMD_CHDIR_HINT_2","directoryname is longer than 8 charachters and/or contains spaces.\nTry \033[31mcd %s\033[0m\n");
MSG_Add("SHELL_CMD_MKDIR_ERROR","Unable to make: %s.\n");
MSG_Add("SHELL_CMD_RMDIR_ERROR","Unable to remove: %s.\n");
MSG_Add("SHELL_CMD_DEL_ERROR","Unable to delete: %s.\n");

21
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.76 2007-06-14 08:23:46 qbix79 Exp $ */
/* $Id: shell_cmds.cpp,v 1.77 2007-08-12 19:16:09 qbix79 Exp $ */
#include <string.h>
#include <ctype.h>
@ -268,7 +268,24 @@ void DOS_Shell::CMD_CHDIR(char * args) {
} else if(strlen(args) == 2 && args[1]==':') {
WriteOut(MSG_Get("SHELL_CMD_CHDIR_HINT"),toupper(*reinterpret_cast<unsigned char*>(&args[0])));
} else if (!DOS_ChangeDir(args)) {
WriteOut(MSG_Get("SHELL_CMD_CHDIR_ERROR"),args);
/* Changedir failed. Check if the filename is longer then 8 and/or contains spaces */
char temp[DOS_PATHLENGTH];
safe_strncpy(temp,args,DOS_PATHLENGTH);
char* dot = strrchr(temp,'.');
if(dot) *dot = 0;
dot = strrchr(temp,' ');
if(dot) { /* Contains spaces */
*dot = 0;
if(strlen(temp) > 6) temp[6] = 0;
strcat(temp,"~1");
WriteOut(MSG_Get("SHELL_CMD_CHDIR_HINT_2"),temp);
} else if(strlen(temp) >8) {
temp[6] = 0;
strcat(temp,"~1");
WriteOut(MSG_Get("SHELL_CMD_CHDIR_HINT_2"),temp);
} else {
WriteOut(MSG_Get("SHELL_CMD_CHDIR_ERROR"),args);
}
}
};