Inicio Explorar Axuda
Iniciar sesión
openpkg
/
openpkg-packages
Seguir 2
Destacar 0
Fork 0
Ficheiros Incidencias 0 Pull Requests 0
Árbore: bf6a7a5d49
Ramas Etiquetas
openpkg-pack...
/
coreutils
/
coreutils.patch

coreutils.patch 8.6 KB
Histórico Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265 
  1. --- src/stat.c.orig	Sun Dec  1 10:48:21 2002
    2. 

  2. +++ src/stat.c	Sun Jan 12 11:30:01 2003
    3. 

  3. @@ -43,6 +43,12 @@
    4. 

  4.  # endif
    5. 

  5.  #endif
    6. 

  6.  
    7. 

  7. +/* FreeBSD 5.0 need this for struct statfs */
    8. 

  8. +#if HAVE_SYS_MOUNT_H
    9. 

  9. +# include <sys/param.h>
    10. 

  10. +# include <sys/mount.h>
    11. 

  11. +#endif
    12. 

  12. +
    13. 

  13.  #include "system.h"
    14. 

  14.  
    15. 

  15.  #include "closeout.h"
    16. 

  16. --- src/test.c.orig	Mon Feb 10 10:19:09 2003
    17. 

  17. +++ src/test.c	Sun Feb 23 20:44:50 2003
    18. 

  18. @@ -139,7 +139,7 @@
    19. 

  19.  /* Do the same thing access(2) does, but use the effective uid and gid.  */
    20. 

  20.  
    21. 

  21.  static int
    22. 

  22. -eaccess (char const *file, int mode)
    23. 

  23. +my_eaccess (char const *file, int mode)
    24. 

  24.  {
    25. 

  25.    static int have_ids;
    26. 

  26.    static uid_t uid, euid;
    27. 

  27. @@ -172,7 +172,7 @@
    28. 

  28.    return result;
    29. 

  29.  }
    30. 

  30.  #else
    31. 

  31. -# define eaccess(F, M) euidaccess (F, M)
    32. 

  32. +# define my_eaccess(F, M) euidaccess (F, M)
    33. 

  33.  #endif
    34. 

  34.  
    35. 

  35.  /* Increment our position in the argument list.  Check that we're not
    36. 

  36. @@ -635,17 +635,17 @@
    37. 

  37.  
    38. 

  38.      case 'r':			/* file is readable? */
    39. 

  39.        unary_advance ();
    40. 

  40. -      value = -1 != eaccess (argv[pos - 1], R_OK);
    41. 

  41. +      value = -1 != my_eaccess (argv[pos - 1], R_OK);
    42. 

  42.        return (TRUE == value);
    43. 

  43.  
    44. 

  44.      case 'w':			/* File is writable? */
    45. 

  45.        unary_advance ();
    46. 

  46. -      value = -1 != eaccess (argv[pos - 1], W_OK);
    47. 

  47. +      value = -1 != my_eaccess (argv[pos - 1], W_OK);
    48. 

  48.        return (TRUE == value);
    49. 

  49.  
    50. 

  50.      case 'x':			/* File is executable? */
    51. 

  51.        unary_advance ();
    52. 

  52. -      value = -1 != eaccess (argv[pos - 1], X_OK);
    53. 

  53. +      value = -1 != my_eaccess (argv[pos - 1], X_OK);
    54. 

  54.        return (TRUE == value);
    55. 

  55.  
    56. 

  56.      case 'O':			/* File is owned by you? */
    57. 

  57. --- src/nice.c.orig	2003-08-10 19:43:35.000000000 +0200
    58. 

  58. +++ src/nice.c	2003-09-10 20:03:27.000000000 +0200
    59. 

  59. @@ -23,6 +23,7 @@
    60. 

  60.  #include <assert.h>
    61. 

  61.  
    62. 

  62.  #include <getopt.h>
    63. 

  63. +#include <sys/time.h>
    64. 

  64.  #include <sys/types.h>
    65. 

  65.  
    66. 

  66.  #include "system.h"
    67. 

  67. 

  68. --- src/date.c.orig	2004-02-05 10:36:07.000000000 +0100
    69. 

  69. +++ src/date.c	2004-03-24 15:22:04.000000000 +0100
    70. 

  70. @@ -299,7 +299,8 @@
    71. 

  71.    int n_args;
    72. 

  72.    int status;
    73. 

  73.    int option_specified_date;
    74. 

  74. -  char const *short_options = (posix2_version () < 200112
    75. 

  75. +  char const *short_options = (posix2_version () < 200112 ||
    76. 

  76. +			       !getenv ("POSIXLY_CORRECT")
    77. 

  77.  			       ? COMMON_SHORT_OPTIONS "I::"
    78. 

  78.  			       : COMMON_SHORT_OPTIONS "I:");
    79. 

  79.  
    80. 

  80. --- src/expand.c.orig	2004-01-21 23:27:02.000000000 +0100
    81. 

  81. +++ src/expand.c	2004-03-24 15:23:21.000000000 +0100
    82. 

  82. @@ -406,6 +406,8 @@
    83. 

  83.      }
    84. 

  84.  
    85. 

  85.    if (obsolete_tablist && 200112 <= posix2_version ())
    86. 

  86. +  if (obsolete_tablist && 200112 <= posix2_version () &&
    87. 

  87. +    getenv ("POSIXLY_CORRECT"))
    88. 

  88.      {
    89. 

  89.        error (0, 0, _("`-LIST' option is obsolete; use `-t LIST'"));
    90. 

  90.        usage (EXIT_FAILURE);
    91. 

  91. --- src/fold.c.orig	2004-01-21 23:27:02.000000000 +0100
    92. 

  92. +++ src/fold.c	2004-03-24 15:26:20.000000000 +0100
    93. 

  93. @@ -270,6 +270,7 @@
    94. 

  94.  	      memcpy (s + 2, a + 1, len_a);
    95. 

  95.  	      argv[i] = s;
    96. 

  96.  	      if (200112 <= posix2_version ())
    97. 

  97. +	      if (200112 <= posix2_version () && getenv ("POSIXLY_CORRECT"))
    98. 

  98.  		{
    99. 

  99.  		  error (0, 0, _("`%s' option is obsolete; use `%s'"), a, s);
    100. 

  100.  		  usage (EXIT_FAILURE);
    101. 

  101. --- src/head.c.orig	2004-01-21 23:27:02.000000000 +0100
    102. 

  102. +++ src/head.c	2004-03-24 15:27:04.000000000 +0100
    103. 

  103. @@ -996,6 +996,7 @@
    104. 

  104.  	}
    105. 

  105.  
    106. 

  106.        if (200112 <= posix2_version ())
    107. 

  107. +      if (200112 <= posix2_version () && getenv ("POSIXLY_CORRECT"))
    108. 

  108.  	{
    109. 

  109.  	  error (0, 0, _("`-%s' option is obsolete; use `-%c %.*s%.*s%s'"),
    110. 

  110.  		 n_string, count_lines ? 'n' : 'c',
    111. 

  111. --- src/nice.c.orig	2004-01-22 00:23:24.000000000 +0100
    112. 

  112. +++ src/nice.c	2004-03-24 15:28:51.000000000 +0100
    113. 

  113. @@ -107,7 +107,7 @@
    114. 

  114.        char *s = argv[i];
    115. 

  115.  
    116. 

  116.        if (s[0] == '-' && s[1] == '-' && ISDIGIT (s[2])
    117. 

  117. -	  && posix2_version () < 200112)
    118. 

  118. +	  && (posix2_version () < 200112 || !getenv ("POSIXLY_CORRECT")))
    119. 

  119.  	{
    120. 

  120.  	  if (xstrtol (&s[2], NULL, 10, &adjustment, "") != LONGINT_OK)
    121. 

  121.  	    error (EXIT_FAIL, 0, _("invalid option `%s'"), s);
    122. 

  122. @@ -118,7 +118,7 @@
    123. 

  123.  	}
    124. 

  124.        else if (s[0] == '-'
    125. 

  125.  	       && (ISDIGIT (s[1]) || (s[1] == '+' && ISDIGIT (s[2])))
    126. 

  126. -	       && posix2_version () < 200112)
    127. 

  127. +	       && (posix2_version () < 200112 || !getenv ("POSIXLY_CORRECT")))
    128. 

  128.  	{
    129. 

  129.  	  if (s[1] == '+')
    130. 

  130.  	    ++s;
    131. 

  131. --- src/od.c.orig	2004-01-21 23:27:02.000000000 +0100
    132. 

  132. +++ src/od.c	2004-03-24 15:29:59.000000000 +0100
    133. 

  133. @@ -1621,7 +1621,8 @@
    134. 

  134.    int width_specified = 0;
    135. 

  135.    int n_failed_decodes = 0;
    136. 

  136.    int err;
    137. 

  137. -  char const *short_options = (posix2_version () < 200112
    138. 

  138. +  char const *short_options = (posix2_version () < 200112 ||
    139. 

  139. +			       !getenv ("POSIXLY_CORRECT")
    140. 

  140.  			       ? COMMON_SHORT_OPTIONS "s::w::"
    141. 

  141.  			       : COMMON_SHORT_OPTIONS "s:w:");
    142. 

  142.  
    143. 

  143. --- src/pr.c.orig	2004-01-21 23:27:02.000000000 +0100
    144. 

  144. +++ src/pr.c	2004-03-24 15:30:48.000000000 +0100
    145. 

  145. @@ -854,7 +854,8 @@
    146. 

  146.    int old_w = FALSE;
    147. 

  147.    int old_s = FALSE;
    148. 

  148.    char **file_names;
    149. 

  149. -  char const *short_options = (posix2_version () < 200112
    150. 

  150. +  char const *short_options = (posix2_version () < 200112 ||
    151. 

  151. +			       !getenv ("POSIXLY_CORRECT")
    152. 

  152.  			       ? COMMON_SHORT_OPTIONS "S::"
    153. 

  153.  			       : COMMON_SHORT_OPTIONS "S:");
    154. 

  154.  
    155. 

  155. --- src/sort.c.orig	2004-02-17 11:47:35.000000000 +0100
    156. 

  156. +++ src/sort.c	2004-03-24 15:31:54.000000000 +0100
    157. 

  157. @@ -2219,7 +2219,7 @@
    158. 

  158.    bool mergeonly = false;
    159. 

  159.    int nfiles = 0;
    160. 

  160.    bool posixly_correct = (getenv ("POSIXLY_CORRECT") != NULL);
    161. 

  161. -  bool obsolete_usage = (posix2_version () < 200112);
    162. 

  162. +  bool obsolete_usage = (posix2_version () < 200112) || !posixly_correct;
    163. 

  163.    char const *short_options = (obsolete_usage
    164. 

  164.  			       ? COMMON_SHORT_OPTIONS "y::"
    165. 

  165.  			       : COMMON_SHORT_OPTIONS "y:");
    166. 

  166. --- src/split.c.orig	2004-01-21 23:27:02.000000000 +0100
    167. 

  167. +++ src/split.c	2004-03-24 15:32:48.000000000 +0100
    168. 

  168. @@ -498,6 +498,8 @@
    169. 

  169.      }
    170. 

  170.  
    171. 

  171.    if (digits_optind && 200112 <= posix2_version ())
    172. 

  172. +  if (digits_optind && 200112 <= posix2_version ()
    173. 

  173. +    && getenv ("POSIXLY_CORRECT"))
    174. 

  174.      {
    175. 

  175.        char buffer[INT_BUFSIZE_BOUND (uintmax_t)];
    176. 

  176.        char const *a = umaxtostr (n_units, buffer);
    177. 

  177. --- src/tail.c.orig	2004-01-21 23:27:02.000000000 +0100
    178. 

  178. +++ src/tail.c	2004-03-24 15:33:32.000000000 +0100
    179. 

  179. @@ -1364,7 +1364,7 @@
    180. 

  180.    if (argc < 2)
    181. 

  181.      return 0;
    182. 

  182.  
    183. 

  183. -  obsolete_usage = (posix2_version () < 200112);
    184. 

  184. +  obsolete_usage = (posix2_version () < 200112) || !getenv ("POSIXLY_CORRECT");
    185. 

  185.  
    186. 

  186.    /* If P starts with `+' and the POSIX version predates 1003.1-2001,
    187. 

  187.       or if P starts with `-N' (where N is a digit), or `-l', then it
    188. 

  188. --- src/touch.c.orig	2004-01-21 23:27:02.000000000 +0100
    189. 

  189. +++ src/touch.c	2004-03-24 15:34:28.000000000 +0100
    190. 

  190. @@ -385,7 +385,7 @@
    191. 

  191.    /* The obsolete `MMDDhhmm[YY]' form is valid IFF there are
    192. 

  192.       two or more non-option arguments.  */
    193. 

  193.    if (!date_set && 2 <= argc - optind && !STREQ (argv[optind - 1], "--")
    194. 

  194. -      && posix2_version () < 200112)
    195. 

  195. +      && (posix2_version () < 200112 || !getenv ("POSIXLY_CORRECT")))
    196. 

  196.      {
    197. 

  197.        if (posixtime (&newtime.tv_sec, argv[optind], PDS_TRAILING_YEAR))
    198. 

  198.  	{
    199. 

  199. --- src/unexpand.c.orig	2004-01-21 23:27:02.000000000 +0100
    200. 

  200. +++ src/unexpand.c	2004-03-24 15:35:09.000000000 +0100
    201. 

  201. @@ -461,7 +461,8 @@
    202. 

  202.  	}
    203. 

  203.      }
    204. 

  204.  
    205. 

  205. -  if (obsolete_tablist && 200112 <= posix2_version ())
    206. 

  206. +  if (obsolete_tablist && 200112 <= posix2_version ()
    207. 

  207. +    && getenv ("POSIXLY_CORRECT"))
    208. 

  208.      {
    209. 

  209.        error (0, 0,
    210. 

  210.  	     _("`-LIST' option is obsolete; use `--first-only -t LIST'"));
    211. 

  211. --- src/uniq.c.orig	2004-01-21 23:27:02.000000000 +0100
    212. 

  212. +++ src/uniq.c	2004-03-24 15:36:59.000000000 +0100
    213. 

  213. @@ -446,7 +446,7 @@
    214. 

  214.  	  {
    215. 

  215.  	    unsigned long int size;
    216. 

  216.  	    if (optarg[0] == '+'
    217. 

  217. -		&& posix2_version () < 200112
    218. 

  218. +		&& (posix2_version () < 200112 || !getenv ("POSIXLY_CORRECT"))
    219. 

  219.  		&& xstrtoul (optarg, NULL, 10, &size, "") == LONGINT_OK
    220. 

  220.  		&& size <= SIZE_MAX)
    221. 

  221.  	      skip_chars = size;
    222. 

  222. @@ -531,7 +531,8 @@
    223. 

  223.  	}
    224. 

  224.      }
    225. 

  225.  
    226. 

  226. -  if (obsolete_skip_fields && 200112 <= posix2_version ())
    227. 

  227. +  if (obsolete_skip_fields && 200112 <= posix2_version ()
    228. 

  228. +    && getenv ("POSIXLY_CORRECT"))
    229. 

  229.      {
    230. 

  230.        error (0, 0, _("`-%lu' option is obsolete; use `-f %lu'"),
    231. 

  231.  	     (unsigned long) skip_fields, (unsigned long) skip_fields);
    232. 

  232. Index: doc/Makefile.in
    233. 

  233. --- doc/Makefile.in.orig	2004-03-11 09:57:59.000000000 +0100
    234. 

  234. +++ doc/Makefile.in	2004-04-21 15:11:16.000000000 +0200
    235. 

  235. @@ -319,29 +319,6 @@
    236. 

  236.  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    237. 

  237.  
    238. 

  238.  .texi.info:
    239. 

  239. -	restore=: && \
    240. 

  240. -	backupdir="$(am__leading_dot)am$$$$" && \
    241. 

  241. -	am__cwd=`pwd` && cd $(srcdir) && \
    242. 

  242. -	rm -rf $$backupdir && mkdir $$backupdir && \
    243. 

  243. -	for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \
    244. 

  244. -	  if test -f $$f; then \
    245. 

  245. -	    mv $$f $$backupdir; \
    246. 

  246. -	    restore=mv; \
    247. 

  247. -	  fi; \
    248. 

  248. -	done; \
    249. 

  249. -	cd "$$am__cwd"; \
    250. 

  250. -	if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
    251. 

  251. -	 -o $@ $<; \
    252. 

  252. -	then \
    253. 

  253. -	  rc=0; \
    254. 

  254. -	  cd $(srcdir); \
    255. 

  255. -	else \
    256. 

  256. -	  rc=$$?; \
    257. 

  257. -	  cd $(srcdir) && \
    258. 

  258. -	  $$restore $$backupdir/* `echo "./$@" | sed 's|[^/]*$$||'`; \
    259. 

  259. -	fi; \
    260. 

  260. -	rm -rf $$backupdir; \
    261. 

  261. -	exit $$rc
    262. 

  262.  
    263. 

  263.  .texi.dvi:
    264. 

  264.  	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
    265. 

  265.