Markus Amsler : cmd: Check for argument in copy, mkdir, delete, goto,
move, rmdir, rename, type.
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Oct 31 15:07:58 CST 2006
Module: wine
Branch: master
Commit: 765ff5d629c7161ea05574b023da897a75952579
URL: http://source.winehq.org/git/wine.git/?a=commit;h=765ff5d629c7161ea05574b023da897a75952579
Author: Markus Amsler <markus.amsler at oribi.org>
Date: Tue Oct 31 21:11:28 2006 +0100
cmd: Check for argument in copy, mkdir, delete, goto, move, rmdir, rename, type.
---
programs/cmd/builtins.c | 34 ++++++++++++++++++++++++++++++++++
1 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c
index 3329a0b..8a79b98 100644
--- a/programs/cmd/builtins.c
+++ b/programs/cmd/builtins.c
@@ -110,6 +110,11 @@ BOOL force, status;
static const char overwrite[] = "Overwrite file (Y/N)?";
char string[8], outpath[MAX_PATH], inpath[MAX_PATH], *infile;
+ if (param1[0] == 0x00) {
+ WCMD_output ("Argument missing\n");
+ return;
+ }
+
if ((strchr(param1,'*') != NULL) && (strchr(param1,'%') != NULL)) {
WCMD_output ("Wildcards not yet supported\n");
return;
@@ -203,6 +208,10 @@ BOOL create_full_path(CHAR* path)
void WCMD_create_dir (void) {
+ if (param1[0] == 0x00) {
+ WCMD_output ("Argument missing\n");
+ return;
+ }
if (!create_full_path(param1)) WCMD_print_error ();
}
@@ -220,6 +229,10 @@ HANDLE hff;
char fpath[MAX_PATH];
char *p;
+ if (param1[0] == 0x00) {
+ WCMD_output ("Argument missing\n");
+ return;
+ }
hff = FindFirstFile (param1, &fd);
if (hff == INVALID_HANDLE_VALUE) {
WCMD_output ("%s :File Not Found\n",param1);
@@ -413,6 +426,10 @@ void WCMD_goto (void) {
char string[MAX_PATH];
+ if (param1[0] == 0x00) {
+ WCMD_output ("Argument missing\n");
+ return;
+ }
if (context != NULL) {
SetFilePointer (context -> h, 0, NULL, FILE_BEGIN);
while (WCMD_fgets (string, sizeof(string), context -> h)) {
@@ -484,6 +501,11 @@ char outpath[MAX_PATH], inpath[MAX_PATH]
WIN32_FIND_DATA fd;
HANDLE hff;
+ if (param1[0] == 0x00) {
+ WCMD_output ("Argument missing\n");
+ return;
+ }
+
if ((strchr(param1,'*') != NULL) || (strchr(param1,'%') != NULL)) {
WCMD_output ("Wildcards not yet supported\n");
return;
@@ -533,6 +555,10 @@ char string[32];
void WCMD_remove_dir (void) {
+ if (param1[0] == 0x00) {
+ WCMD_output ("Argument missing\n");
+ return;
+ }
if (!RemoveDirectory (param1)) WCMD_print_error ();
}
@@ -547,6 +573,10 @@ void WCMD_rename (void) {
int status;
+ if (param1[0] == 0x00 || param2[0] == 0x00) {
+ WCMD_output ("Argument missing\n");
+ return;
+ }
if ((strchr(param1,'*') != NULL) || (strchr(param1,'%') != NULL)) {
WCMD_output ("Wildcards not yet supported\n");
return;
@@ -1008,6 +1038,10 @@ HANDLE h;
char buffer[512];
DWORD count;
+ if (param1[0] == 0x00) {
+ WCMD_output ("Argument missing\n");
+ return;
+ }
h = CreateFile (param1, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING,
FILE_ATTRIBUTE_NORMAL, NULL);
if (h == INVALID_HANDLE_VALUE) {
More information about the wine-cvs
mailing list