introduction of os-specific.c and os-specific.h (f1261bcd) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP curl

src/Makefile.Watcom

+8 −3

Original line number	Diff line number	Diff line
		@@ -14,7 +14,8 @@ OBJ_DIR = WC_Win32.obj

		OBJS = $(OBJ_DIR)\getpass.obj $(OBJ_DIR)\homedir.obj $(OBJ_DIR)\hugehelp.obj &
		$(OBJ_DIR)\main.obj $(OBJ_DIR)\urlglob.obj $(OBJ_DIR)\writeenv.obj &
		$(OBJ_DIR)\writeout.obj $(OBJ_DIR)\curlutil.obj $(OBJ_DIR)\rawstr.obj
		$(OBJ_DIR)\writeout.obj $(OBJ_DIR)\curlutil.obj $(OBJ_DIR)\rawstr.obj &
		$(OBJ_DIR)\os-specific.obj

		RESOURCE = $(OBJ_DIR)\curl.res

		@@ -78,7 +79,8 @@ $(OBJ_DIR)\main.obj: main.c setup.h config-win32.h ..\lib\setup_once.h &
		version.h ..\include\curl\curlver.h ..\lib\curlx.h &
		..\include\curl\mprintf.h ..\lib\strequal.h ..\lib\strtoofft.h &
		..\lib\setup.h ..\lib\config-win32.h ..\include\curl\curlbuild.h &
		..\include\curl\curlrules.h ..\lib\timeval.h ..\lib\memdebug.h
		..\include\curl\curlrules.h ..\lib\timeval.h ..\lib\memdebug.h &
		os-specific.h

		$(OBJ_DIR)\urlglob.obj: urlglob.c setup.h config-win32.h ..\lib\setup_once.h &
		..\include\curl\curl.h ..\include\curl\curlver.h &
		@@ -86,7 +88,7 @@ $(OBJ_DIR)\urlglob.obj: urlglob.c setup.h config-win32.h ..\lib\setup_once.h &
		..\include\curl\easy.h ..\include\curl\multi.h ..\include\curl\curl.h &
		..\include\curl\mprintf.h urlglob.h ..\lib\memdebug.h ..\lib\setup.h &
		..\lib\config-win32.h ..\include\curl\curlbuild.h &
		..\include\curl\curlrules.h
		..\include\curl\curlrules.h os-specific.h

		$(OBJ_DIR)\writeenv.obj: writeenv.c setup.h config-win32.h ..\lib\setup_once.h

		@@ -99,6 +101,9 @@ $(OBJ_DIR)\writeout.obj: writeout.c setup.h config-win32.h ..\lib\setup_once.h &
		$(OBJ_DIR)\curlutil.obj: curlutil.c setup.h config-win32.h ..\lib\setup_once.h &
		curlutil.h

		$(OBJ_DIR)\os-specific.obj: os-specific.c os-specific.h setup.h config-win32.h &
		..\lib\setup_once.h

		$(OBJ_DIR)\rawstr.obj: ..\lib\rawstr.c ..\lib\setup.h ..\lib\config-win32.h &
		..\include\curl\curlbuild.h ..\include\curl\curlrules.h ..\lib\setup_once.h &
		..\include\curl\curl.h ..\include\curl\curlver.h ..\include\curl\curlrules.h &

src/Makefile.inc

+2 −2

Original line number	Diff line number	Diff line
		@@ -7,10 +7,10 @@ CURLX_ONES = $(top_srcdir)/lib/strtoofft.c \
		$(top_srcdir)/lib/rawstr.c

		CURL_SOURCES = main.c hugehelp.c urlglob.c writeout.c writeenv.c \
		getpass.c homedir.c curlutil.c
		getpass.c homedir.c curlutil.c os-specific.c

		CURL_HFILES = hugehelp.h setup.h config-win32.h config-mac.h \
		config-riscos.h urlglob.h version.h \
		config-riscos.h urlglob.h version.h os-specific.h \
		writeout.h writeenv.h getpass.h homedir.h curlutil.h

		curl_SOURCES = $(CURL_SOURCES) $(CURLX_ONES) $(CURL_HFILES)

src/Makefile.riscos

+9 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,9 @@ o.hugehelp: c.hugehelp
		o.main: c.main
		gcc $(compileropts) -c -o main.o c.main

		o.os-specific: c.os-specific
		gcc $(compileropts) -c -o os-specific.o c.os-specific

		o.urlglob: c.urlglob
		gcc $(compileropts) -c -o urlglob.o c.urlglob

		@@ -39,12 +42,18 @@ o.hugehelp: c.hugehelp

		o.main: c.main
		o.main: h.setup
		o.main: h.os-specific
		o.main: h.urlglob
		o.main: h.writeout
		o.main: h.version

		o.os-specific: c.os-specific
		o.os-specific: h.setup
		o.os-specific: h.os-specific

		o.urlglob: c.urlglob
		o.urlglob: h.setup
		o.urlglob: h.os-specific
		o.urlglob: h.urlglob

		o.writeout: c.writeout

src/Makefile.vc6

+6 −0

Original line number	Diff line number	Diff line
		@@ -98,6 +98,7 @@ RELEASE_OBJS= \
		getpassr.obj \
		homedirr.obj \
		curlutilr.obj \
		os-specificr.obj \
		rawstrr.obj \
		strtoofftr.obj \
		mainr.obj \
		@@ -110,6 +111,7 @@ DEBUG_OBJS= \
		getpassd.obj \
		homedird.obj \
		curlutild.obj \
		os-specificd.obj \
		rawstrd.obj \
		strtoofftd.obj \
		maind.obj \
		@@ -247,6 +249,8 @@ homedirr.obj: homedir.c
		$(CCR) $(CFLAGS) /Fo"$@" homedir.c
		curlutilr.obj: curlutil.c
		$(CCR) $(CFLAGS) /Fo"$@" curlutil.c
		os-specificr.obj: os-specific.c
		$(CCR) $(CFLAGS) /Fo"$@" os-specific.c
		rawstrr.obj: ../lib/rawstr.c
		$(CCR) $(CFLAGS) /Fo"$@" ../lib/rawstr.c
		strtoofftr.obj: ../lib/strtoofft.c
		@@ -269,6 +273,8 @@ homedird.obj: homedir.c
		$(CCD) $(CFLAGS) /Fo"$@" homedir.c
		curlutild.obj: curlutil.c
		$(CCD) $(CFLAGS) /Fo"$@" curlutil.c
		os-specificd.obj: os-specific.c
		$(CCD) $(CFLAGS) /Fo"$@" os-specific.c
		rawstrd.obj: ../lib/rawstr.c
		$(CCD) $(CFLAGS) /Fo"$@" ../lib/rawstr.c
		strtoofftd.obj: ../lib/strtoofft.c

src/main.c

+26 −20

Original line number	Diff line number	Diff line
		@@ -114,6 +114,12 @@
		#include <netinet/tcp.h> /* for TCP_KEEPIDLE, TCP_KEEPINTVL */
		#endif

		#ifdef __VMS
		# include "curlmsg_vms.h"
		#endif

		#include "os-specific.h"

		/* The last #include file should be: */
		#ifdef CURLDEBUG
		#ifndef CURLTOOLDEBUG
		@@ -200,10 +206,6 @@ typedef enum {
		#define mkdir(x,y) (mkdir)(x)
		#endif

		#ifdef VMS
		#include "curlmsg_vms.h"
		#endif

		/*
		* Large file support (>2Gb) using WIN32 functions.
		*/
		@@ -4996,11 +4998,16 @@ operate(struct Configurable *config, int argc, argv_item_t argv[])

		show_error:

		#ifdef VMS
		#ifdef __VMS
		if(is_vms_shell()) {
		/* VMS DCL shell behavior */
		if(!config->showerror) {
		vms_show = VMSSTS_HIDE;
		}
		#else
		}
		else
		#endif
		{
		if((res!=CURLE_OK) && config->showerror) {
		fprintf(config->errors, "curl: (%d) %s\n", res,
		errorbuffer[0]? errorbuffer:
		@@ -5026,7 +5033,7 @@ show_error:
		CURL_CA_CERT_ERRORMSG2 );
		}
		}
		#endif
		}

		if (outfile && !curlx_strequal(outfile, "-") && outs.stream)
		fclose(outs.stream);
		@@ -5182,9 +5189,8 @@ int main(int argc, char *argv[])
		#ifdef __NOVELL_LIBC__
		pressanykey();
		#endif
		#ifdef VMS
		if (res > CURL_LAST) res = CURL_LAST; /* If CURL_LAST exceeded then */
		return (vms_cond[res]\|vms_show); /* curlmsg.h is out of sync. */
		#ifdef __VMS
		vms_special_exit(res, vms_show);
		#else
		return res;
		#endif