mirror of the now-defunct rocklinux.org
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.

61 lines
2.1 KiB

  1. # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
  2. #
  3. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  4. # Please add additional copyright information _after_ the line containing
  5. # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
  6. # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
  7. #
  8. # ROCK Linux: rock-src/package/blindcoder/ezipupdate/errno.patch
  9. # ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
  10. #
  11. # This program is free software; you can redistribute it and/or modify
  12. # it under the terms of the GNU General Public License as published by
  13. # the Free Software Foundation; either version 2 of the License, or
  14. # (at your option) any later version. A copy of the GNU General Public
  15. # License can be found at Documentation/COPYING.
  16. #
  17. # Many people helped and are helping developing ROCK Linux. Please
  18. # have a look at http://www.rocklinux.org/ and the Documentation/TEAM
  19. # file for details.
  20. #
  21. # --- ROCK-COPYRIGHT-NOTE-END ---
  22. --- ./conf_file.c.orig 2000-10-23 04:36:18.000000000 +0200
  23. +++ ./conf_file.c 2003-05-28 08:42:42.000000000 +0200
  24. @@ -1,4 +1,4 @@
  25. -/* ============================================================================
  26. + /* ============================================================================
  27. * Copyright (C) 1999 Angus Mackay. All rights reserved;
  28. *
  29. * This program is free software; you can redistribute it and/or modify
  30. @@ -37,13 +37,16 @@
  31. #include <conf_file.h>
  32. -#if HAVE_STRERROR
  33. +#if HAVE_ERRNO_H
  34. +# include <errno.h>
  35. +#elif HAVE_STRERROR
  36. extern int errno;
  37. # define error_string strerror(errno)
  38. -#elif HAVE_SYS_ERRLIST
  39. -extern const char *const sys_errlist[];
  40. -extern int errno;
  41. -# define error_string (sys_errlist[errno])
  42. +#endif
  43. +
  44. +#if HAVE_SYS_ERRLIST
  45. +//extern char *const strerror[];
  46. +# define error_string (strerror[errno])
  47. #else
  48. # define error_string "error message not found"
  49. #endif
  50. @@ -85,7 +88,7 @@ int parse_conf_file(char *fname, struct
  51. {
  52. if((in=fopen(fname, "r")) == NULL)
  53. {
  54. - fprintf(stderr, "could not open config file \"%s\": %s\n", fname, error_string);
  55. + fprintf(stderr, "could not open config file \"%s\"\n", fname);
  56. return(-1);
  57. }
  58. }