Commit c42849bb authored by Viktor Szakats's avatar Viktor Szakats
Browse files

examples/Makefile.m32: sync with core [ci skip] 

also:
- fix two warnings in synctime.c (one of them Windows-specific)
- upgrade URLs in synctime.c and remove a broken one

Closes https://github.com/curl/curl/pull/3033
parent 5c41f88c

docs/examples/Makefile.m32

+117 −48
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
#                            | (__| |_| |  _ <| |___

#                             \___|\___/|_| \_\_____|

#

# Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.

# Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.

#

# This software is licensed as described in the file COPYING, which

# you should have received as part of this distribution. The terms
@@ -18,13 +18,16 @@ 
# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY

# KIND, either express or implied.

#

#***************************************************************************



###########################################################################

#

## Makefile for building curl examples with MingW (GCC-3.2 or later)

## and optionally OpenSSL (1.0.2a), libssh2 (1.5), zlib (1.2.8), librtmp (2.4)

## and optionally OpenSSL (1.0.2a), libssh2 (1.5), zlib (1.2.8), librtmp (2.4),

## brotli (1.0.1)

##

## Usage:   mingw32-make -f Makefile.m32 CFG=-feature1[-feature2][-feature3][...]

## Example: mingw32-make -f Makefile.m32 CFG=-zlib-ssl-spi-winidn

## Example: mingw32-make -f Makefile.m32 CFG=-zlib-ssl-sspi-winidn

##

## Hint: you can also set environment vars to control the build, f.e.:

## set ZLIB_PATH=c:/zlib-1.2.8
@@ -36,6 +39,10 @@ 
ifndef ZLIB_PATH

ZLIB_PATH = ../../../zlib-1.2.8

endif

# Edit the path below to point to the base of your Brotli sources.

ifndef BROTLI_PATH

BROTLI_PATH = ../../../brotli-1.0.1

endif

# Edit the path below to point to the base of your OpenSSL package.

ifndef OPENSSL_PATH

OPENSSL_PATH = ../../../openssl-1.0.2a
@@ -48,9 +55,21 @@ endif 
ifndef LIBRTMP_PATH

LIBRTMP_PATH = ../../../librtmp-2.4

endif

# Edit the path below to point to the base of your libidn package.

ifndef LIBIDN_PATH

LIBIDN_PATH = ../../../libidn-1.32

# Edit the path below to point to the base of your libmetalink package.

ifndef LIBMETALINK_PATH

LIBMETALINK_PATH = ../../../libmetalink-0.1.3

endif

# Edit the path below to point to the base of your libexpat package.

ifndef LIBEXPAT_PATH

LIBEXPAT_PATH = ../../../expat-2.1.0

endif

# Edit the path below to point to the base of your libxml2 package.

ifndef LIBXML2_PATH

LIBXML2_PATH = ../../../libxml2-2.9.2

endif

# Edit the path below to point to the base of your libidn2 package.

ifndef LIBIDN2_PATH

LIBIDN2_PATH = ../../../libidn2-2.0.3

endif

# Edit the path below to point to the base of your MS IDN package.

# Microsoft Internationalized Domain Names (IDN) Mitigation APIs 1.1
@@ -74,7 +93,22 @@ ifndef LIBCARES_PATH 
LIBCARES_PATH = $(PROOT)/ares

endif



# Edit the var below to set to your architecture or set environment var.

ifeq ($(CURL_CC),)

CURL_CC := $(CROSSPREFIX)gcc

endif

ifeq ($(CURL_AR),)

CURL_AR := $(CROSSPREFIX)ar

endif



CC = $(CURL_CC)

CFLAGS = $(CURL_CFLAG_EXTRAS) -g -O2 -Wall -W

CFLAGS += -fno-strict-aliasing

# comment LDFLAGS below to keep debug info

LDFLAGS = $(CURL_LDFLAG_EXTRAS) $(CURL_LDFLAG_EXTRAS_EXE) -s

RC = $(CROSSPREFIX)windres

RCFLAGS = --include-dir=$(PROOT)/include -O COFF



# Set environment var ARCH to your architecture to override autodetection.

ifndef ARCH

ifeq ($(findstring x86_64,$(shell $(CC) -dumpmachine)),x86_64)

ARCH = w64
@@ -83,9 +117,6 @@ ARCH = w32 
endif

endif



CC	= $(CROSSPREFIX)gcc

CFLAGS	= -g -O2 -Wall -W

CFLAGS	+= -fno-strict-aliasing

ifeq ($(ARCH),w64)

CFLAGS  += -m64 -D_AMD64_

LDFLAGS += -m64
@@ -95,10 +126,6 @@ CFLAGS += -m32 
LDFLAGS += -m32

RCFLAGS += -F pe-i386

endif

# comment LDFLAGS below to keep debug info

LDFLAGS	= -s

RC	= $(CROSSPREFIX)windres

RCFLAGS	= --include-dir=$(PROOT)/include -O COFF -i



# Platform-dependent helper tool macros

ifeq ($(findstring /sh,$(SHELL)),/sh)
@@ -153,8 +180,11 @@ endif 
ifeq ($(findstring -zlib,$(CFG)),-zlib)

ZLIB = 1

endif

ifeq ($(findstring -idn,$(CFG)),-idn)

IDN = 1

ifeq ($(findstring -brotli,$(CFG)),-brotli)

BROTLI = 1

endif

ifeq ($(findstring -idn2,$(CFG)),-idn2)

IDN2 = 1

endif

ifeq ($(findstring -winidn,$(CFG)),-winidn)

WINIDN = 1
@@ -208,8 +238,24 @@ endif 
ifdef SSH2

  CFLAGS += -DUSE_LIBSSH2 -DHAVE_LIBSSH2_H

  curl_LDADD += -L"$(LIBSSH2_PATH)/win32" -lssh2

  ifdef WINSSL

    ifndef DYN

      curl_LDADD += -lbcrypt -lcrypt32

    endif

  endif

endif

ifdef SSL

  ifndef OPENSSL_INCLUDE

    ifeq "$(wildcard $(OPENSSL_PATH)/outinc)" "$(OPENSSL_PATH)/outinc"

      OPENSSL_INCLUDE = $(OPENSSL_PATH)/outinc

    endif

    ifeq "$(wildcard $(OPENSSL_PATH)/include)" "$(OPENSSL_PATH)/include"

      OPENSSL_INCLUDE = $(OPENSSL_PATH)/include

    endif

  endif

  ifneq "$(wildcard $(OPENSSL_INCLUDE)/openssl/opensslv.h)" "$(OPENSSL_INCLUDE)/openssl/opensslv.h"

  $(error Invalid path to OpenSSL package: $(OPENSSL_PATH))

  endif

  ifndef OPENSSL_LIBPATH

    OPENSSL_LIBS = -lssl -lcrypto

    ifeq "$(wildcard $(OPENSSL_PATH)/out)" "$(OPENSSL_PATH)/out"
@@ -225,28 +271,52 @@ ifdef SSL 
  ifndef DYN

    OPENSSL_LIBS += -lgdi32 -lcrypt32

  endif

  INCLUDES += -I"$(OPENSSL_INCLUDE)"

  CFLAGS += -DUSE_OPENSSL

  curl_LDADD += -L"$(OPENSSL_LIBPATH)" $(OPENSSL_LIBS)

endif

ifdef WINSSL

  CFLAGS += -DUSE_SCHANNEL

  curl_LDADD += -lcrypt32

endif

ifdef ZLIB

  INCLUDES += -I"$(ZLIB_PATH)"

  CFLAGS += -DHAVE_LIBZ -DHAVE_ZLIB_H

  curl_LDADD += -L"$(ZLIB_PATH)" -lz

endif

ifdef IDN

  CFLAGS += -DUSE_LIBIDN

  curl_LDADD += -L"$(LIBIDN_PATH)/lib" -lidn

ifdef BROTLI

  INCLUDES += -I"$(BROTLI_PATH)/include"

  CFLAGS += -DHAVE_BROTLI

  curl_LDADD += -L"$(BROTLI_PATH)/lib"

  ifdef BROTLI_LIBS

    curl_LDADD += $(BROTLI_LIBS)

  else

    curl_LDADD += -lbrotlidec

  endif

endif

ifdef IDN2

  CFLAGS += -DUSE_LIBIDN2

  curl_LDADD += -L"$(LIBIDN2_PATH)/lib" -lidn2

else

ifdef WINIDN

  CFLAGS += -DUSE_WIN32_IDN

  curl_LDADD += -L"$(WINIDN_PATH)" -lnormaliz

endif

endif

ifdef METALINK

  INCLUDES += -I"$(LIBMETALINK_PATH)/include"

  CFLAGS += -DUSE_METALINK

  curl_LDADD += -L"$(LIBMETALINK_PATH)/lib" -lmetalink

  ifndef DYN

    ifeq ($(findstring libexpat_metalink_parser.o,$(shell $(AR) t "$(LIBMETALINK_PATH)/lib/libmetalink.a")),libexpat_metalink_parser.o)

      curl_LDADD += -L"$(LIBEXPAT_PATH)/lib" -lexpat

    else

      curl_LDADD += -L"$(LIBXML2_PATH)/lib" -lxml2

    endif

  endif

endif

ifdef SSPI

  CFLAGS += -DUSE_WINDOWS_SSPI

  ifdef WINSSL

    CFLAGS += -DUSE_SCHANNEL

  endif

endif

ifdef IPV6

  CFLAGS += -DENABLE_IPV6 -D_WIN32_WINNT=0x0501
@@ -287,11 +357,10 @@ all: $(check_PROGRAMS) 
	$(CC) $(INCLUDES) $(CFLAGS) -c $<



%.res: %.rc

	$(RC) $(RCFLAGS) $< -o $@

	$(RC) $(RCFLAGS) -i $< -o $@



clean:

	@$(call DEL, $(check_PROGRAMS:.exe=.o))



distclean vclean: clean

	@$(call DEL, $(check_PROGRAMS))

docs/examples/synctime.c

+10 −8
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -30,11 +30,11 @@ 
 * Set proxy as according to your network, but beware of proxy Cache-Control.

 *

 * To set your system clock, root access is required.

 * # date -s "`curl -sI http://nist.time.gov/timezone.cgi?UTC/s/0 \

 * # date -s "`curl -sI https://nist.time.gov/timezone.cgi?UTC/s/0 \

 *        | awk -F': ' '/Date: / {print $2}'`"

 *

 * To view remote webserver date and time.

 * $ curl -sI http://nist.time.gov/timezone.cgi?UTC/s/0 \

 * $ curl -sI https://nist.time.gov/timezone.cgi?UTC/s/0 \

 *        | awk -F': ' '/Date: / {print $2}'

 *

 * Synchronising your computer clock via Internet time server usually relies
@@ -63,8 +63,8 @@ 
 *    webserver provide Cache-Control to prevent caching.

 *

 * References:

 * http://tf.nist.gov/timefreq/service/its.htm

 * http://tf.nist.gov/timefreq/service/firewall.htm

 * https://web.archive.org/web/20100228012139/tf.nist.gov/timefreq/service/its.htm

 * https://web.archive.org/web/20100409024302/tf.nist.gov/timefreq/service/firewall.htm

 *

 * Usage:

 * This software will synchronise your computer clock only when you issue
@@ -88,6 +88,7 @@ 
#include <stdio.h>

#include <time.h>

#ifndef __CYGWIN__

#include <winsock2.h>

#include <windows.h>

#endif

#include <curl/curl.h>
@@ -107,9 +108,8 @@ typedef struct 


const char DefaultTimeServer[3][MAX_STRING1] =

{

  "http://pool.ntp.org/",

  "http://nist.time.gov/",

  "http://www.google.com/"

  "https://nist.time.gov/",

  "https://www.google.com/"

};



const char *DayStr[] = {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
@@ -138,6 +138,8 @@ size_t SyncTime_CURL_WriteHeader(void *ptr, size_t size, size_t nmemb, 
  int   i, RetVal;

  char  TmpStr1[26], TmpStr2[26];



  (void)stream;



  if(ShowAllHeader == 1)

    fprintf(stderr, "%s", (char *)(ptr));