Matt Kraai provided a patch that makes curl build on QNX 6 fine again. Mostly
by letting configure check for setmode and ifdef on HAVE_SETMODE. NOTE: non- configure platforms that havve setmode() needs their hard-coded config.h files fixed. I fixed the src/config-win32.h.
This commit is contained in:
3
CHANGES
3
CHANGES
@@ -6,6 +6,9 @@
|
|||||||
|
|
||||||
Changelog
|
Changelog
|
||||||
|
|
||||||
|
Daniel S (1 April 2007)
|
||||||
|
- Matt Kraai provided a patch that makes curl build on QNX 6 fine again.
|
||||||
|
|
||||||
Daniel S (31 March 2007)
|
Daniel S (31 March 2007)
|
||||||
- Fixed several minor issues detected by the coverity.com scanner.
|
- Fixed several minor issues detected by the coverity.com scanner.
|
||||||
|
|
||||||
|
|||||||
@@ -70,6 +70,7 @@ advice from friends like these:
|
|||||||
Rob Crittenden, Robert A. Monat, Dan Fandrich, Duncan Mac-Vicar Prett,
|
Rob Crittenden, Robert A. Monat, Dan Fandrich, Duncan Mac-Vicar Prett,
|
||||||
Michal Marek, Robson Braga Araujo, Ian Turner, Linus Nielsen Feltzing,
|
Michal Marek, Robson Braga Araujo, Ian Turner, Linus Nielsen Feltzing,
|
||||||
Ravi Pratap, Adam D. Moss, Jose Kahan, Hang Kin Lau, Justin Fletcher,
|
Ravi Pratap, Adam D. Moss, Jose Kahan, Hang Kin Lau, Justin Fletcher,
|
||||||
Robert Iakobashvili, Bryan Henderson, Eygene Ryabinkin, Daniel Johnson
|
Robert Iakobashvili, Bryan Henderson, Eygene Ryabinkin, Daniel Johnson,
|
||||||
|
Matt Kraai
|
||||||
|
|
||||||
Thanks! (and sorry if I forgot to mention someone)
|
Thanks! (and sorry if I forgot to mention someone)
|
||||||
|
|||||||
@@ -1850,7 +1850,8 @@ AC_CHECK_FUNCS( strtoll \
|
|||||||
getprotobyname \
|
getprotobyname \
|
||||||
getrlimit \
|
getrlimit \
|
||||||
setrlimit \
|
setrlimit \
|
||||||
fork,
|
fork \
|
||||||
|
setmode,
|
||||||
dnl if found
|
dnl if found
|
||||||
[],
|
[],
|
||||||
dnl if not found, $ac_func is the name we check for
|
dnl if not found, $ac_func is the name we check for
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
* | (__| |_| | _ <| |___
|
* | (__| |_| | _ <| |___
|
||||||
* \___|\___/|_| \_\_____|
|
* \___|\___/|_| \_\_____|
|
||||||
*
|
*
|
||||||
* Copyright (C) 1998 - 2006, Daniel Stenberg, <daniel@haxx.se>, et al.
|
* Copyright (C) 1998 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al.
|
||||||
*
|
*
|
||||||
* This software is licensed as described in the file COPYING, which
|
* This software is licensed as described in the file COPYING, which
|
||||||
* you should have received as part of this distribution. The terms
|
* you should have received as part of this distribution. The terms
|
||||||
@@ -26,6 +26,10 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
|
|
||||||
|
#ifdef HAVE_STRINGS_H
|
||||||
|
#include <strings.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "strequal.h"
|
#include "strequal.h"
|
||||||
|
|
||||||
#if defined(HAVE_STRCASECMP) && defined(__STRICT_ANSI__)
|
#if defined(HAVE_STRCASECMP) && defined(__STRICT_ANSI__)
|
||||||
|
|||||||
@@ -72,6 +72,9 @@
|
|||||||
/* FUNCTIONS */
|
/* FUNCTIONS */
|
||||||
/* ---------------------------------------------------------------- */
|
/* ---------------------------------------------------------------- */
|
||||||
|
|
||||||
|
/* Define if you have the setmode function. */
|
||||||
|
#define HAVE_SETMODE 1
|
||||||
|
|
||||||
/* Define if you have the ftruncate function. */
|
/* Define if you have the ftruncate function. */
|
||||||
#define HAVE_FTRUNCATE 1
|
#define HAVE_FTRUNCATE 1
|
||||||
|
|
||||||
|
|||||||
@@ -2014,7 +2014,7 @@ static ParameterError getparameter(char *flag, /* f or -long-flag */
|
|||||||
|
|
||||||
if(curlx_strequal("-", nextarg)) {
|
if(curlx_strequal("-", nextarg)) {
|
||||||
file = stdin;
|
file = stdin;
|
||||||
#ifdef O_BINARY
|
#if defined(O_BINARY) && defined(HAVE_SETMODE)
|
||||||
if(subletter == 'b') /* forced binary */
|
if(subletter == 'b') /* forced binary */
|
||||||
setmode(fileno(stdin), O_BINARY);
|
setmode(fileno(stdin), O_BINARY);
|
||||||
#endif
|
#endif
|
||||||
@@ -3966,7 +3966,7 @@ operate(struct Configurable *config, int argc, char *argv[])
|
|||||||
|
|
||||||
}
|
}
|
||||||
else if(uploadfile && curlx_strequal(uploadfile, "-")) {
|
else if(uploadfile && curlx_strequal(uploadfile, "-")) {
|
||||||
#ifdef O_BINARY
|
#if defined(O_BINARY) && defined(HAVE_SETMODE)
|
||||||
setmode(fileno(stdin), O_BINARY);
|
setmode(fileno(stdin), O_BINARY);
|
||||||
#endif
|
#endif
|
||||||
infd = stdin;
|
infd = stdin;
|
||||||
@@ -4029,7 +4029,7 @@ operate(struct Configurable *config, int argc, char *argv[])
|
|||||||
if(!config->errors)
|
if(!config->errors)
|
||||||
config->errors = stderr;
|
config->errors = stderr;
|
||||||
|
|
||||||
#ifdef O_BINARY
|
#if defined(O_BINARY) && defined(HAVE_SETMODE)
|
||||||
if(!outfile && !(config->conf & CONF_GETTEXT)) {
|
if(!outfile && !(config->conf & CONF_GETTEXT)) {
|
||||||
/* We get the output to stdout and we have not got the ASCII/text flag,
|
/* We get the output to stdout and we have not got the ASCII/text flag,
|
||||||
then set stdout to be binary */
|
then set stdout to be binary */
|
||||||
|
|||||||
Reference in New Issue
Block a user