Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-27 17:44:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use crtdll instead of ntdll.

Browse source 
svn path=/trunk/; revision=453
This commit is contained in:
Eric Kohl 1999-05-11 16:08:21 +00:00
parent acd3d263c1
commit 5edb029d51
6 changed files with 37 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reactos/apps/utils/cmd/cmd.c
View file

@ -552,7 +552,7 @@ VOID ParseCommandLine (LPTSTR s)
CloseHandle (hErr); CloseHandle (hErr);
hOldConErr = INVALID_HANDLE_VALUE; hOldConErr = INVALID_HANDLE_VALUE;
} }
#endif #endif /* FEATURE_REDIRECTION */
/* process final command */ /* process final command */
DoCommand (s); DoCommand (s);
@ -615,7 +615,6 @@ VOID ParseCommandLine (LPTSTR s)
#ifdef _DEBUG #ifdef _DEBUG
DebugPrintf (_T("hFile[0] and hIn dont match!!!\n")); DebugPrintf (_T("hFile[0] and hIn dont match!!!\n"));
#endif #endif
} }
} }
} }
@ -998,5 +997,4 @@ int main (int argc, char *argv[])
FreeConsole (); FreeConsole ();
return nExitCode; return nExitCode;
// return 0;
} }

4
reactos/apps/utils/cmd/error.c
View file

@ -83,6 +83,10 @@ VOID ErrorMessage (DWORD dwErrorCode, LPTSTR szFormat, ...)
szError = _T("Path not found --"); szError = _T("Path not found --");
break; break;
case ERROR_BAD_PATHNAME: /* a1 */
szError = _T("Invalid path");
break;
default: default:
ConErrPrintf (_T("Unknown error! Error code: 0x%lx\n"), dwErrorCode); ConErrPrintf (_T("Unknown error! Error code: 0x%lx\n"), dwErrorCode);
return; return;

12
reactos/apps/utils/cmd/makefile
View file

@ -2,20 +2,16 @@
# ReactOS makefile for CMD # ReactOS makefile for CMD
# #
# target: raw binary (does not work right now)
#all: cmd.bin
# target: executable (not tested/experimental)
all: cmd.exe all: cmd.exe
OBJECTS = ../common/crt0.o cmd.o attrib.o alias.o batch.o beep.o call.o \ OBJECTS = ../common/crt0.o cmd.o attrib.o alias.o batch.o beep.o call.o \
chcp.o cls.o cmdinput.o cmdtable.o color.o console.o copy.o date.o \ chcp.o cls.o cmdinput.o cmdtable.o color.o console.o copy.o date.o \
del.o dir.o dirstack.o echo.o error.o filecomp.o for.o goto.o \ del.o dir.o dirstack.o echo.o error.o filecomp.o for.o goto.o \
history.o if.o internal.o label.o locale.o misc.o move.o path.o \ history.o if.o internal.o label.o locale.o misc.o move.o path.o \
pause.o prompt.o redir.o ren.o ros.o set.o shift.o time.o title.o type.o \ pause.o prompt.o redir.o ren.o set.o shift.o time.o title.o type.o \
ver.o verify.o vol.o where.o ver.o verify.o vol.o where.o
LIBS= ../../lib/kernel32/kernel32.a ../../lib/ntdll/ntdll.a LIBS= ../../lib/kernel32/kernel32.a ../../lib/crtdll/crtdll.a
CLEAN_FILES = *.o cmd.exe cmd.sym CLEAN_FILES = *.o cmd.exe cmd.sym
@ -26,10 +22,6 @@ $(CLEAN_FILES:%=%_clean): %_clean:
.phony: clean $(CLEAN_FILES:%=%_clean) .phony: clean $(CLEAN_FILES:%=%_clean)
cmd.bin: $(OBJECTS)
$(LD) -Ttext 0x10000 $(OBJECTS) $(LIBS) -o cmd.exe
$(OBJCOPY) -O binary cmd.exe cmd.bin
cmd.exe: $(OBJECTS) $(LIBS) cmd.exe: $(OBJECTS) $(LIBS)
$(CC) -specs=../../specs $(OBJECTS) $(LIBS) -lgcc -o cmd.exe $(CC) -specs=../../specs $(OBJECTS) $(LIBS) -lgcc -o cmd.exe
$(NM) --numeric-sort cmd.exe > cmd.sym $(NM) --numeric-sort cmd.exe > cmd.sym