You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
57 lines
1.9 KiB
57 lines
1.9 KiB
18 years ago
|
# --- T2-COPYRIGHT-NOTE-BEGIN ---
|
||
|
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||
|
|
#
|
||
|
|
# T2 SDE: package/.../ezipupdate/errno.patch
|
||
|
|
# Copyright (C) 2004 - 2006 The T2 SDE Project
|
||
|
|
# Copyright (C) 1998 - 2003 Clifford Wolf
|
||
|
|
#
|
||
|
|
# More information can be found in the files COPYING and README.
|
||
|
|
#
|
||
|
|
# This patch file is dual-licensed. It is available under the license the
|
||
|
|
# patched project is licensed under, as long as it is an OpenSource license
|
||
|
|
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||
|
|
# of the GNU General Public License as published by the Free Software
|
||
|
|
# Foundation; either version 2 of the License, or (at your option) any later
|
||
|
|
# version.
|
||
|
|
# --- T2-COPYRIGHT-NOTE-END ---
|
||
|
|
|
||
|
|
--- ./conf_file.c.orig 2000-10-23 04:36:18.000000000 +0200
|
||
|
|
+++ ./conf_file.c 2003-05-28 08:42:42.000000000 +0200
|
||
|
|
@@ -1,4 +1,4 @@
|
||
|
|
-/* ============================================================================
|
||
|
|
+ /* ============================================================================
|
||
|
|
* Copyright (C) 1999 Angus Mackay. All rights reserved;
|
||
|
|
*
|
||
|
|
* This program is free software; you can redistribute it and/or modify
|
||
|
|
@@ -37,13 +37,16 @@
|
||
|
|
|
||
|
|
#include <conf_file.h>
|
||
|
|
|
||
|
|
-#if HAVE_STRERROR
|
||
|
|
+#if HAVE_ERRNO_H
|
||
|
|
+# include <errno.h>
|
||
|
|
+#elif HAVE_STRERROR
|
||
|
|
extern int errno;
|
||
|
|
# define error_string strerror(errno)
|
||
|
|
-#elif HAVE_SYS_ERRLIST
|
||
|
|
-extern const char *const sys_errlist[];
|
||
|
|
-extern int errno;
|
||
|
|
-# define error_string (sys_errlist[errno])
|
||
|
|
+#endif
|
||
|
|
+
|
||
|
|
+#if HAVE_SYS_ERRLIST
|
||
|
|
+//extern char *const strerror[];
|
||
|
|
+# define error_string (strerror[errno])
|
||
|
|
#else
|
||
|
|
# define error_string "error message not found"
|
||
|
|
#endif
|
||
|
|
@@ -85,7 +88,7 @@ int parse_conf_file(char *fname, struct
|
||
|
|
{
|
||
|
|
if((in=fopen(fname, "r")) == NULL)
|
||
|
|
{
|
||
|
|
- fprintf(stderr, "could not open config file \"%s\": %s\n", fname, error_string);
|
||
|
|
+ fprintf(stderr, "could not open config file \"%s\"\n", fname);
|
||
|
|
return(-1);
|
||
|
|
}
|
||
|
|
}
|