From 253fa4b7a0a556840f829541791c7112355a41f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Fri, 27 Apr 2007 17:40:50 +0000 Subject: [PATCH] Fix mkdir command, if compiled in UNICODE. Patch by Pierre Schweitzer (heis_spiter at hotmail dot com) See issue #2216 for more details. svn path=/trunk/; revision=26545 --- reactos/base/shell/cmd/internal.c | 2 +- reactos/base/shell/cmd/lang/fr-FR.rc | 2 ++ reactos/base/shell/cmd/resource.h | 6 +++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/reactos/base/shell/cmd/internal.c b/reactos/base/shell/cmd/internal.c index 5c62a9bbd2b..f6904d684fd 100644 --- a/reactos/base/shell/cmd/internal.c +++ b/reactos/base/shell/cmd/internal.c @@ -440,7 +440,7 @@ MakeFullPath(TCHAR * DirPath) while ((p = _tcschr(p, _T('\\'))) != NULL) { n = p - DirPath + 1; - memcpy(path, DirPath, n); + _tcsncpy(path, DirPath, n); path[n] = _T('\0'); if( !CreateDirectory(path, NULL) && (GetLastError() != ERROR_ALREADY_EXISTS)) diff --git a/reactos/base/shell/cmd/lang/fr-FR.rc b/reactos/base/shell/cmd/lang/fr-FR.rc index 6f60039f112..2c31b7bca8e 100644 --- a/reactos/base/shell/cmd/lang/fr-FR.rc +++ b/reactos/base/shell/cmd/lang/fr-FR.rc @@ -570,6 +570,8 @@ STRING_CHCP_ERROR4, "Page de code invalide \n" STRING_CHOICE_ERROR, "Option invalide. Format attendu: /C[:]options" STRING_CHOICE_ERROR_TXT, "Option invalide. Format attendu: /T[:]c,nn" STRING_CHOICE_ERROR_OPTION, "Option invalide : %s" +STRING_MD_ERROR, "Un sous répertoire ou un fichier est déjà existant.\n" +STRING_MD_ERROR2, "Le chemin vers le nouveau répertoire n'existe pas.\n" STRING_CMD_ERROR1, "Ne peut rediriger l'entrée depuis le fichier %s\n" STRING_CMD_ERROR2, "Erreur à la création du fichier temporaire pour les données du pipe\n" STRING_CMD_ERROR3, "Ne peut rediriger vers le fichier %s\n" diff --git a/reactos/base/shell/cmd/resource.h b/reactos/base/shell/cmd/resource.h index 776370852ea..ff0f0a5035a 100644 --- a/reactos/base/shell/cmd/resource.h +++ b/reactos/base/shell/cmd/resource.h @@ -219,9 +219,9 @@ #define STRING_EXPECTED_CLOSE_PAREN 721 #define STRING_EXPECTED_NUMBER_OR_VARIABLE 722 #define STRING_SYNTAX_COMMAND_INCORRECT 723 -#define STRING_RMDIR_HELP2 724 -#define STRING_MD_ERROR 725 -#define STRING_MD_ERROR2 726 +#define STRING_RMDIR_HELP2 724 +#define STRING_MD_ERROR 725 +#define STRING_MD_ERROR2 726 /* These strings are language independent (cmd.rc) */