forked from holzschu/ios_system
-
Notifications
You must be signed in to change notification settings - Fork 0
/
file_cmds.patch
4986 lines (4656 loc) · 142 KB
/
file_cmds.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
diff -Naur file_cmds-272/chflags/chflags.c file_cmds/chflags/chflags.c
--- file_cmds-272/chflags/chflags.c 2010-03-19 04:52:40.000000000 +0100
+++ file_cmds/chflags/chflags.c 2018-12-08 16:03:27.000000000 +0100
@@ -52,11 +52,13 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+#include "ios_error.h"
+
static void usage(void);
int
-main(int argc, char *argv[])
+chflags_main(int argc, char *argv[])
{
FTS *ftsp;
FTSENT *p;
@@ -68,6 +70,8 @@
int (*change_flags)(const char *, u_int);
Hflag = Lflag = Rflag = fflag = hflag = vflag = 0;
+ optind = 1; opterr = 1; optreset = 1;
+
while ((ch = getopt(argc, argv, "HLPRfhv")) != -1)
switch (ch) {
case 'H':
@@ -105,9 +109,10 @@
if (Rflag) {
fts_options = FTS_PHYSICAL;
- if (hflag)
- errx(1, "the -R and -h options "
- "may not be specified together");
+ if (hflag) {
+ errx(1, "the -R and -h options "
+ "may not be specified together");
+ }
if (Hflag)
fts_options |= FTS_COMFOLLOW;
if (Lflag) {
@@ -128,21 +133,25 @@
val = strtol(flags, &ep, 8);
if (val < 0)
errno = ERANGE;
- if (errno)
- err(1, "invalid flags: %s", flags);
- if (*ep)
- errx(1, "invalid flags: %s", flags);
+ if (errno) {
+ err(1, "invalid flags: %s", flags);
+ }
+ if (*ep) {
+ errx(1, "invalid flags: %s", flags);
+ }
set = val;
oct = 1;
} else {
- if (strtofflags(&flags, &set, &clear))
+ if (strtofflags(&flags, &set, &clear)) {
errx(1, "invalid flag: %s", flags);
+ }
clear = ~clear;
oct = 0;
}
- if ((ftsp = fts_open(++argv, fts_options , 0)) == NULL)
+ if ((ftsp = fts_open(++argv, fts_options , 0)) == NULL) {
err(1, NULL);
+ }
for (rval = 0; (p = fts_read(ftsp)) != NULL;) {
switch (p->fts_info) {
@@ -182,16 +191,17 @@
warn("%s", p->fts_path);
rval = 1;
} else if (vflag) {
- (void)printf("%s", p->fts_path);
+ (void)fprintf(thread_stdout, "%s", p->fts_path);
if (vflag > 1)
- (void)printf(": 0%lo -> 0%lo",
+ (void)fprintf(thread_stdout, ": 0%lo -> 0%lo",
(u_long)p->fts_statp->st_flags,
newflags);
- (void)printf("\n");
+ (void)fprintf(thread_stdout, "\n");
}
}
- if (errno)
+ if (errno) {
err(1, "fts_read");
+ }
exit(rval);
}
diff -Naur file_cmds-272/chmod/chmod.c file_cmds/chmod/chmod.c
--- file_cmds-272/chmod/chmod.c 2013-10-05 00:39:00.000000000 +0200
+++ file_cmds/chmod/chmod.c 2018-12-08 16:03:27.000000000 +0100
@@ -60,17 +60,19 @@
#ifdef __APPLE__
#include "chmod_acl.h"
+#include "ios_error.h" // remap exit to pthread_exit
#endif /*__APPLE__*/
-int fflag = 0;
+__thread int chmod_fflag = 0;
-int main(int, char *[]);
-void usage(void);
+int chmod_main(int, char *[]);
+void chmod_usage(void);
int
-main(int argc, char *argv[])
+chmod_main(int argc, char *argv[])
{
+ chmod_fflag = 0;
FTS *ftsp = NULL;
FTSENT *p = NULL;
mode_t *set = NULL;
@@ -88,12 +90,13 @@
size_t acloptlen = 0;
int ace_arg_not_required = 0;
acl_t acl_input = NULL;
+ optind = 1; opterr = 1; optreset = 1;
#endif /* __APPLE__*/
int (*change_mode)(const char *, mode_t);
set = NULL;
omode = 0;
- Hflag = Lflag = Pflag = Rflag = fflag = hflag = vflag = 0;
+ Hflag = Lflag = Pflag = Rflag = chmod_fflag = hflag = vflag = 0;
#ifndef __APPLE__
while ((ch = getopt(argc, argv, "HLPRXfghorstuvwx")) != -1)
#else
@@ -118,7 +121,7 @@
Rflag = 1;
break;
case 'f':
- fflag = 1;
+ chmod_fflag = 1;
break;
case 'h':
/*
@@ -188,19 +191,19 @@
break;
case '?':
default:
- usage();
+ chmod_usage();
}
done: argv += optind;
argc -= optind;
#ifdef __APPLE__
if (argc < ((acloptflags & ACL_FLAG) ? 1 : 2))
- usage();
+ chmod_usage();
if (!Rflag && (Hflag || Lflag || Pflag))
warnx("options -H, -L, -P only useful with -R");
#else /* !__APPLE__ */
if (argc < 2)
- usage();
+ chmod_usage();
#endif /* __APPLE__ */
#ifdef __APPLE__
@@ -222,7 +225,7 @@
}
if (argc < 3)
- usage();
+ chmod_usage();
if (acloptlen > 2) {
for (index = 2; index < acloptlen; index++) {
@@ -232,7 +235,7 @@
if (argc < ((acloptflags & ACL_DELETE_FLAG)
? 3 : 4))
- usage();
+ chmod_usage();
argv++;
argc--;
errno = 0;
@@ -241,8 +244,9 @@
if (aclpos > ACL_MAX_ENTRIES
|| aclpos < 0)
errno = ERANGE;
- if (errno || *ep)
- errx(1, "Invalid ACL entry number: %ld", aclpos);
+ if (errno || *ep) {
+ errx(1, "Invalid ACL entry number: %ld", aclpos);
+ }
if (acloptflags & ACL_DELETE_FLAG)
ace_arg_not_required = 1;
@@ -255,13 +259,13 @@
*/
inheritance_level++;
if (inheritance_level > 1)
- warnx("Inheritance across more than one generation is not currently supported");
+ warnx("Inheritance across more than one generation is not currently supported");
if (inheritance_level >= MAX_INHERITANCE_LEVEL)
goto apdone;
break;
default:
errno = EINVAL;
- usage();
+ chmod_usage();
}
}
}
@@ -274,9 +278,9 @@
if (Rflag) {
fts_options = FTS_PHYSICAL;
- if (hflag)
- errx(1,
- "the -R and -h options may not be specified together.");
+ if (hflag) {
+ errx(1, "the -R and -h options may not be specified together.");
+ }
if (Hflag)
fts_options |= FTS_COMFOLLOW;
if (Lflag) {
@@ -297,17 +301,19 @@
mode = (char *) malloc(MAX_ACL_TEXT_SIZE);
- if (mode == NULL)
+ if (mode == NULL) {
err(1, "Unable to allocate mode string");
+ }
/* Read the ACEs from STDIN */
do {
readtotal += readval;
- readval = read(STDIN_FILENO, mode + readtotal,
+ readval = read(fileno(thread_stdin), mode + readtotal,
MAX_ACL_TEXT_SIZE);
} while ((readval > 0) && (readtotal <= MAX_ACL_TEXT_SIZE));
- if (0 == readtotal)
+ if (0 == readtotal) {
errx(1, "-E specified, but read from STDIN failed");
+ }
else
mode[readtotal - 1] = '\0';
--argv;
@@ -342,22 +348,26 @@
val = strtol(mode, &ep, 8);
if (val > USHRT_MAX || val < 0)
errno = ERANGE;
- if (errno)
+ if (errno) {
err(1, "Invalid file mode: %s", mode);
- if (*ep)
+ }
+ if (*ep) {
errx(1, "Invalid file mode: %s", mode);
+ }
omode = (mode_t)val;
oct = 1;
} else {
- if ((set = setmode(mode)) == NULL)
+ if ((set = setmode(mode)) == NULL) {
errx(1, "Invalid file mode: %s", mode);
+ }
oct = 0;
}
#ifdef __APPLE__
}
#endif /* __APPLE__*/
- if ((ftsp = fts_open(++argv, fts_options, 0)) == NULL)
+ if ((ftsp = fts_open(++argv, fts_options, 0)) == NULL) {
err(1, "fts_open");
+ }
for (rval = 0; (p = fts_read(ftsp)) != NULL;) {
switch (p->fts_info) {
case FTS_D:
@@ -402,12 +412,12 @@
newmode = oct ? omode : getmode(set, p->fts_statp->st_mode);
if ((newmode & ALLPERMS) == (p->fts_statp->st_mode & ALLPERMS))
continue;
- if ((*change_mode)(p->fts_accpath, newmode) && !fflag) {
- warn("Unable to change file mode on %s", p->fts_path);
+ if ((*change_mode)(p->fts_accpath, newmode) && !chmod_fflag) {
+ warn("Unable to change file mode on %s", p->fts_path);
rval = 1;
} else {
if (vflag) {
- (void)printf("%s", p->fts_accpath);
+ (void)fprintf(thread_stdout, "%s", p->fts_accpath);
if (vflag > 1) {
char m1[12], m2[12];
@@ -416,12 +426,12 @@
strmode((p->fts_statp->st_mode &
S_IFMT) | newmode, m2);
- (void)printf(": 0%o [%s] -> 0%o [%s]",
+ (void)fprintf(thread_stdout, ": 0%o [%s] -> 0%o [%s]",
p->fts_statp->st_mode, m1,
(p->fts_statp->st_mode & S_IFMT) |
newmode, m2);
}
- (void)printf("\n");
+ (void)fprintf(thread_stdout, "\n");
}
}
@@ -429,8 +439,9 @@
}
#endif /* __APPLE__*/
}
- if (errno)
+ if (errno) {
err(1, "fts_read");
+ }
#ifdef __APPLE__
if (acl_input)
acl_free(acl_input);
@@ -444,7 +455,7 @@
}
void
-usage(void)
+chmod_usage(void)
{
#ifdef __APPLE__
(void)fprintf(stderr,
diff -Naur file_cmds-272/chmod/chmod_acl.c file_cmds/chmod/chmod_acl.c
--- file_cmds-272/chmod/chmod_acl.c 2015-08-04 22:32:26.000000000 +0200
+++ file_cmds/chmod/chmod_acl.c 2018-12-08 16:03:27.000000000 +0100
@@ -42,8 +42,9 @@
#include <membership.h>
#include "chmod_acl.h"
+#include "ios_error.h"
-extern void usage(void);
+extern void chmod_usage(void);
#ifdef __APPLE__
static struct {
@@ -115,7 +116,9 @@
return entryg;
}
+ free(entryg);
errx(1, "Unable to translate '%s' to a UUID", tok);
+ return NULL; // never reached
}
/* Convert an acl entry in string form to an acl_entry_t */
@@ -205,6 +208,7 @@
acl_set_permset(newent, perms);
acl_set_flagset_np(newent, flags);
free(entryg);
+ entryg = NULL;
return(0);
}
@@ -228,22 +232,25 @@
#else
inbuf = malloc(MAX_ACL_TEXT_SIZE);
- if (inbuf == NULL)
+ if (inbuf == NULL) {
err(1, "malloc() failed");
+ }
strncpy(inbuf, input, MAX_ACL_TEXT_SIZE);
inbuf[MAX_ACL_TEXT_SIZE - 1] = '\0';
- if ((acl_input = acl_init(1)) == NULL)
+ if ((acl_input = acl_init(1)) == NULL) {
err(1, "acl_init() failed");
+ }
oinbuf = inbuf;
for (bufp = entryv; (*bufp = strsep(&oinbuf, "\n")) != NULL;)
if (**bufp != '\0') {
- if (0 != acl_create_entry(&acl_input, &newent))
+ if (0 != acl_create_entry(&acl_input, &newent)) {
err(1, "acl_create_entry() failed");
+ }
if (0 != parse_entry(*bufp, newent)) {
- errx(1, "Failed parsing entry '%s'", *bufp);
+ errx(1, "Failed parsing entry '%s'", *bufp);
}
if (++bufp >= &entryv[ACL_MAX_ENTRIES - 1]) {
errx(1, "Too many entries");
@@ -285,8 +292,9 @@
if (acl_get_flagset_np(entry, &flags) != 0){
err(1, "Unable to obtain flagset");
}
- if (acl_get_permset(entry, &perms) != 0)
- err(1, "Malformed ACL entry, no permset present");
+ if (acl_get_permset(entry, &perms) != 0) {
+ err(1, "Malformed ACL entry, no permt present");
+ }
switch(tag) {
case ACL_EXTENDED_ALLOW:
@@ -365,10 +373,12 @@
if (compare != 0)
return MATCH_NONE;
- if (0 != acl_get_tag_type(a, &atag))
+ if (0 != acl_get_tag_type(a, &atag)) {
err(1, "No tag type present in entry");
- if (0!= acl_get_tag_type(b, &btag))
+ }
+ if (0!= acl_get_tag_type(b, &btag)) {
err(1, "No tag type present in entry");
+ }
if (atag != btag)
return MATCH_NONE;
@@ -376,8 +386,9 @@
if ((acl_get_permset(a, &aperms) != 0) ||
(acl_get_flagset_np(a, &aflags) != 0) ||
(acl_get_permset(b, &bperms) != 0) ||
- (acl_get_flagset_np(b, &bflags) != 0))
+ (acl_get_flagset_np(b, &bflags) != 0)) {
err(1, "error fetching permissions");
+ }
pcmp = compare_acl_permsets(aperms, bperms);
fcmp = compare_acl_flagsets(aflags, bflags);
@@ -476,11 +487,13 @@
if (match_inherited) {
acl_flagset_t eflags, mflags;
- if (0 != acl_get_flagset_np(modifier, &mflags))
+ if (0 != acl_get_flagset_np(modifier, &mflags)) {
err(1, "Unable to get flagset");
+ }
- if (0 != acl_get_flagset_np(entry, &eflags))
+ if (0 != acl_get_flagset_np(entry, &eflags)) {
err(1, "Unable to get flagset");
+ }
if (compare_acl_flagsets(mflags, eflags) == MATCH_EXACT) {
*rentryp = entry;
@@ -511,8 +524,9 @@
if ((acl_get_permset(rentry, &rperms) != 0) ||
(acl_get_flagset_np(rentry, &rflags) != 0) ||
(acl_get_permset(modifier, &mperms) != 0) ||
- (acl_get_flagset_np(modifier, &mflags) != 0))
+ (acl_get_flagset_np(modifier, &mflags) != 0)) {
err(1, "error computing ACL modification");
+ }
for (i = 0; acl_perms[i].name != NULL; i++) {
if (acl_get_perm_np(mperms, acl_perms[i].perm))
@@ -539,8 +553,9 @@
if ((acl_get_permset(rentry, &rperms) != 0) ||
(acl_get_flagset_np(rentry, &rflags) != 0) ||
(acl_get_permset(modifier, &mperms) != 0) ||
- (acl_get_flagset_np(modifier, &mflags) != 0))
+ (acl_get_flagset_np(modifier, &mflags) != 0)) {
err(1, "error computing ACL modification");
+ }
for (i = 0; acl_perms[i].name != NULL; i++) {
if (acl_get_perm_np(mperms, acl_perms[i].perm))
@@ -578,8 +593,9 @@
if (optflags & ACL_SET_FLAG) {
if (position != -1) {
- if (0 != acl_create_entry_np(&oacl, &newent, position))
+ if (0 != acl_create_entry_np(&oacl, &newent, position)) {
err(1, "acl_create_entry() failed");
+ }
acl_copy_entry(newent, modifier);
} else {
/* If an entry exists, add the new permissions to it, else add an
@@ -601,17 +617,18 @@
}
/* Insert the entry in canonical order */
cpos = find_canonical_position(oacl, modifier);
- if (0!= acl_create_entry_np(&oacl, &newent, cpos))
+ if (0!= acl_create_entry_np(&oacl, &newent, cpos)) {
err(1, "acl_create_entry() failed");
+ }
acl_copy_entry(newent, modifier);
}
} else if (optflags & ACL_DELETE_FLAG) {
if (flag_new_acl) {
- warnx("No ACL present '%s'", path);
+ warnx("No ACL present '%s'", path);
retval = 1;
} else if (position != -1 ) {
if (0 != acl_get_entry(oacl, position, &rentry)) {
- warnx("Invalid entry number '%s'", path);
+ warnx("Invalid entry number '%s'", path);
retval = 1;
} else {
acl_delete_entry(oacl, rentry);
@@ -642,7 +659,7 @@
}
}
if (0 == match_found) {
- warnx("Entry not found when attempting delete '%s'",path);
+ warnx("Entry not found when attempting delete '%s'",path);
retval = 1;
}
}
@@ -650,18 +667,21 @@
acl_entry_t rentry;
if (-1 == position) {
- usage();
+ chmod_usage();
}
if (0 == flag_new_acl) {
if (0 != acl_get_entry(oacl, position,
- &rentry))
+ &rentry)) {
err(1, "Invalid entry number '%s'", path);
+ }
- if (0 != acl_delete_entry(oacl, rentry))
+ if (0 != acl_delete_entry(oacl, rentry)) {
err(1, "Unable to delete entry '%s'", path);
+ }
}
- if (0!= acl_create_entry_np(&oacl, &newent, position))
+ if (0!= acl_create_entry_np(&oacl, &newent, position)) {
err(1, "acl_create_entry() failed");
+ }
acl_copy_entry(newent, modifier);
}
ma_exit:
@@ -678,7 +698,7 @@
acl_entry_t entry = NULL;
unsigned retval = 0;
- extern int fflag;
+ extern __thread int chmod_fflag;
/* XXX acl_get_file() returns a zero entry ACL if an ACL was previously
* associated with the file, and has had its entries removed.
@@ -695,7 +715,7 @@
*/
if (path == NULL)
- usage();
+ chmod_usage();
if (optflags & ACL_CLEAR_FLAG) {
filesec_t fsec = filesec_init();
@@ -703,11 +723,11 @@
err(1, "filesec_init() failed");
}
if (filesec_set_property(fsec, FILESEC_ACL, _FILESEC_REMOVE_ACL) != 0) {
- err(1, "filesec_set_property() failed");
+ err(1, "filesec_set_property() failed");
}
if (follow) {
if (chmodx_np(path, fsec) != 0) {
- if (!fflag) {
+ if (!chmod_fflag) {
warn("Failed to clear ACL on file %s", path);
}
retval = 1;
@@ -716,14 +736,14 @@
int fd = open(path, O_SYMLINK);
if (fd != -1) {
if (fchmodx_np(fd, fsec) != 0) {
- if (!fflag) {
- warn("Failed to clear ACL on file %s", path);
+ if (!chmod_fflag) {
+ warn("Failed to clear ACL on file %s", path);
}
retval = 1;
}
close(fd);
} else {
- if (!fflag) {
+ if (!chmod_fflag) {
warn("Failed to open file %s", path);
}
retval = 1;
@@ -747,8 +767,9 @@
}
if ((oacl == NULL) ||
(acl_get_entry(oacl,ACL_FIRST_ENTRY, &newent) != 0)) {
- if ((oacl = acl_init(1)) == NULL)
+ if ((oacl = acl_init(1)) == NULL) {
err(1, "acl_init() failed");
+ }
flag_new_acl = 1;
position = 0;
}
@@ -756,8 +777,9 @@
if ((0 == flag_new_acl) && (optflags & (ACL_REMOVE_INHERIT_FLAG |
ACL_REMOVE_INHERITED_ENTRIES))) {
acl_t facl = NULL;
- if ((facl = acl_init(1)) == NULL)
+ if ((facl = acl_init(1)) == NULL) {
err(1, "acl_init() failed");
+ }
for (aindex = 0;
acl_get_entry(oacl,
(entry == NULL ? ACL_FIRST_ENTRY :
@@ -766,7 +788,7 @@
acl_flagset_t eflags;
acl_entry_t fent = NULL;
if (acl_get_flagset_np(entry, &eflags) != 0) {
- err(1, "Unable to obtain flagset");
+ err(1, "Unable to obtain flagset");
}
if (acl_get_flag_np(eflags, ACL_ENTRY_INHERITED)) {
@@ -844,8 +866,8 @@
}
}
if (status != 0) {
- if (!fflag)
- warn("Failed to set ACL on file '%s'", path);
+ if (!chmod_fflag)
+ warn("Failed to set ACL on file '%s'", path);
retval = 1;
}
}
diff -Naur file_cmds-272/chown/chown.c file_cmds/chown/chown.c
--- file_cmds-272/chown/chown.c 2013-10-05 00:39:00.000000000 +0200
+++ file_cmds/chown/chown.c 2018-12-08 16:03:27.000000000 +0100
@@ -60,26 +60,27 @@
#include <string.h>
#include <unistd.h>
#include <sys/time.h>
+#include "ios_error.h"
#ifdef __APPLE__
-#include <get_compat.h>
-#else
+// #include <get_compat.h>
+// #else
#define COMPAT_MODE(a,b) (1)
#endif /* __APPLE__ */
-void a_gid(const char *);
-void a_uid(const char *);
-void chownerr(const char *);
+static void a_gid(const char *);
+static void a_uid(const char *);
+static void chownerr(const char *);
static uid_t id(const char *, const char *);
-void usage(void);
+static void usage(void);
-uid_t uid;
-gid_t gid;
-int ischown;
-const char *gname;
+static uid_t uid;
+static gid_t gid;
+static int ischown;
+static const char *gname;
int
-main(int argc, char **argv)
+chown_main(int argc, char **argv)
{
FTS *ftsp;
FTSENT *p;
@@ -96,6 +97,7 @@
ischown = (strcmp(cp, "chown") == 0);
Hflag = Lflag = Pflag = Rflag = fflag = hflag = vflag = 0;
+ optind = 1; opterr = 1; optreset = 1;
while ((ch = getopt(argc, argv, "HLPRfhv")) != -1)
switch (ch) {
case 'H':
@@ -132,13 +134,14 @@
if (argc < 2)
usage();
if (!Rflag && (Hflag || Lflag || Pflag))
- warnx("options -H, -L, -P only useful with -R");
+ warnx("options -H, -L, -P only useful with -R");
if (Rflag) {
fts_options = FTS_PHYSICAL;
- if (hflag && (Hflag || Lflag))
- errx(1, "the -R%c and -h options may not be "
- "specified together", Hflag ? 'H' : 'L');
+ if (hflag && (Hflag || Lflag)) {
+ errx(1, "the -R%c and -h options may not be "
+ "specified together\n", Hflag ? 'H' : 'L');
+ }
if (Hflag)
fts_options |= FTS_COMFOLLOW;
else if (Lflag) {
@@ -158,7 +161,7 @@
}
#ifdef SUPPORT_DOT
else if ((cp = strchr(*argv, '.')) != NULL) {
- warnx("separation of user and group with a period is deprecated");
+ warnx("separation of user and group with a period is deprecated");
*cp++ = '\0';
a_gid(cp);
}
@@ -169,8 +172,9 @@
a_gid(*argv);
}
- if ((ftsp = fts_open(++argv, fts_options, 0)) == NULL)
- err(1, NULL);
+ if ((ftsp = fts_open(++argv, fts_options, 0)) == NULL) {
+ err(1, NULL);
+ }
for (rval = 0; (p = fts_read(ftsp)) != NULL;) {
symlink_found = 0;
@@ -180,13 +184,13 @@
fts_set(ftsp, p, FTS_SKIP);
continue;
case FTS_DNR: /* Warn, chown. */
- warnx("%s: %s", p->fts_path, strerror(p->fts_errno));
+ warnx("%s: %s", p->fts_path, strerror(p->fts_errno));
rval = 1;
break;
case FTS_ERR: /* Warn, continue. */
case FTS_NS:
warnx("%s: %s", p->fts_path, strerror(p->fts_errno));
- rval = 1;
+ rval = 1;
continue;
case FTS_SL:
case FTS_SLNONE:
@@ -203,7 +207,7 @@
if (Hflag || Lflag) { /* -H or -L was specified */
if (p->fts_errno) {
warnx("%s: %s", p->fts_name, strerror(p->fts_errno));
- rval = 1;
+ rval = 1;
continue;
}
}
@@ -230,11 +234,12 @@
}
} else {
if (vflag)
- printf("%s\n", p->fts_path);
+ fprintf(thread_stdout, "%s\n", p->fts_path);
}
}
- if (errno)
+ if (errno) {
err(1, "fts_read");
+ }
exit(rval);
}
@@ -267,8 +272,9 @@
errno = 0;
val = strtoul(name, &ep, 10);
- if (errno || *ep != '\0' || val > UID_MAX)
+ if (errno || *ep != '\0' || val > UID_MAX) {
errx(1, "%s: illegal %s name", name, type);
+ }
return (uid_t)val;
}
diff -Naur file_cmds-272/cksum/cksum.c file_cmds/cksum/cksum.c
--- file_cmds-272/cksum/cksum.c 2013-10-05 00:39:00.000000000 +0200
+++ file_cmds/cksum/cksum.c 2018-12-08 16:03:27.000000000 +0100
@@ -61,11 +61,13 @@
#include <unistd.h>
#include "extern.h"
+#include <errno.h>
+#include "ios_error.h" // remap exit to pthread_exit
static void usage(void);
int
-main(int argc, char **argv)
+chksum_main(int argc, char **argv)
{
uint32_t val;
int ch, fd, rval;
@@ -75,6 +77,7 @@
void (*pfncn)(char *, u_int32_t, off_t);
cfncn=NULL;
+ optind = 1; opterr = 1; optreset = 1;
if(*argv) {
if ((p = rindex(argv[0], '/')) == NULL)
@@ -102,10 +105,10 @@
cfncn = csum2;
pfncn = psum2;
} else if (!strcmp(optarg, "3")) {
- cfncn = crc32;
+ cfncn = chksum_crc32;
pfncn = pcrc;
} else {
- warnx("illegal argument to -o option");
+ warnx("illegal argument to -o option");
usage();
}
break;
@@ -117,20 +120,20 @@
argv += optind;
}
- fd = STDIN_FILENO;
+ fd = fileno(thread_stdin);
fn = NULL;
rval = 0;
do {
if (*argv) {
fn = *argv++;
if ((fd = open(fn, O_RDONLY, 0)) < 0) {
- warn("%s", fn);
+ warn("%s", fn);
rval = 1;
continue;
}
}
if (cfncn(fd, &val, &len)) {
- warn("%s", fn ? fn : "stdin");
+ warn("%s", fn ? fn : "stdin");
rval = 1;
} else
pfncn(fn, val, len);
diff -Naur file_cmds-272/cksum/crc32.c file_cmds/cksum/crc32.c
--- file_cmds-272/cksum/crc32.c 2012-03-14 00:22:38.000000000 +0100
+++ file_cmds/cksum/crc32.c 2018-12-08 16:03:27.000000000 +0100
@@ -98,7 +98,7 @@
uint32_t crc32_total = 0;
int
-crc32(int fd, uint32_t *cval, off_t *clen)
+chksum_crc32(int fd, uint32_t *cval, off_t *clen)
{
uint32_t lcrc = ~0;
ssize_t nr;
diff -Naur file_cmds-272/cksum/extern.h file_cmds/cksum/extern.h
--- file_cmds-272/cksum/extern.h 2006-12-09 07:36:49.000000000 +0100
+++ file_cmds/cksum/extern.h 2018-12-08 16:03:27.000000000 +0100
@@ -43,5 +43,5 @@
void psum2(char *, uint32_t, off_t);
int csum1(int, uint32_t *, off_t *);
int csum2(int, uint32_t *, off_t *);
-int crc32(int, uint32_t *, off_t *);
+int chksum_crc32(int, uint32_t *, off_t *);
__END_DECLS
diff -Naur file_cmds-272/cksum/print.c file_cmds/cksum/print.c
--- file_cmds-272/cksum/print.c 2006-12-09 07:36:49.000000000 +0100
+++ file_cmds/cksum/print.c 2018-12-08 16:03:27.000000000 +0100
@@ -46,30 +46,31 @@
#include <stdint.h>
#include "extern.h"
+#include "ios_error.h"
void
pcrc(char *fn, uint32_t val, off_t len)
{
- (void)printf("%lu %jd", (u_long)val, (intmax_t)len);
+ (void)fprintf(thread_stdout, "%lu %jd", (u_long)val, (intmax_t)len);
if (fn != NULL)
- (void)printf(" %s", fn);
- (void)printf("\n");
+ (void)fprintf(thread_stdout, " %s", fn);
+ (void)fprintf(thread_stdout, "\n");
}
void
psum1(char *fn, uint32_t val, off_t len)
{
- (void)printf("%lu %jd", (u_long)val, (intmax_t)(len + 1023) / 1024);
+ (void)fprintf(thread_stdout, "%lu %jd", (u_long)val, (intmax_t)(len + 1023) / 1024);
if (fn != NULL)
- (void)printf(" %s", fn);
- (void)printf("\n");
+ (void)fprintf(thread_stdout, " %s", fn);
+ (void)fprintf(thread_stdout, "\n");
}
void
psum2(char *fn, uint32_t val, off_t len)
{
- (void)printf("%lu %jd", (u_long)val, (intmax_t)(len + 511) / 512);
+ (void)fprintf(thread_stdout, "%lu %jd", (u_long)val, (intmax_t)(len + 511) / 512);
if (fn != NULL)
- (void)printf(" %s", fn);
- (void)printf("\n");
+ (void)fprintf(thread_stdout, " %s", fn);
+ (void)fprintf(thread_stdout, "\n");
}
diff -Naur file_cmds-272/compress/compress.c file_cmds/compress/compress.c
--- file_cmds-272/compress/compress.c 2013-10-05 00:39:00.000000000 +0200
+++ file_cmds/compress/compress.c 2018-12-08 16:03:27.000000000 +0100
@@ -56,28 +56,31 @@
#include <unistd.h>
#include "zopen.h"
+#include "ios_error.h"
-void compress(const char *, const char *, int);
-void cwarn(const char *, ...) __printflike(1, 2);
-void cwarnx(const char *, ...) __printflike(1, 2);
-void decompress(const char *, const char *, int);
-int permission(const char *);
-void setfile(const char *, struct stat *);
-void usage(int);
+static void compress(const char *, const char *, int);
+static void cwarn(const char *, ...) __printflike(1, 2);
+static void cwarnx(const char *, ...) __printflike(1, 2);
+static void decompress(const char *, const char *, int);
+static int permission(const char *);
+static void setfile(const char *, struct stat *);
+static void usage(int);
-int eval, force, verbose, cat;
+static int eval, force, verbose, cat;
int
-main(int argc, char *argv[])
+compress_main(int argc, char *argv[])
{
- enum {COMPRESS, DECOMPRESS} style;
+ enum {COMPRESS, DECOMPRESS} style = 0;
size_t len;
int bits, ch;
char *p, newname[MAXPATHLEN];
if (argc < 1)
usage(1);
- cat = 0;
+ // init all flags
+ eval = force = verbose = cat = 0;
+ optind = 1; opterr = 1; optreset = 1;
if ((p = rindex(argv[0], '/')) == NULL)
p = argv[0];
else
@@ -89,16 +92,20 @@
else if (!strcmp(p, "zcat")) {
cat = 1;
style = DECOMPRESS;
- } else
- errx(1, "unknown program name");
+ } else {
+ // errx(1, "unknown program name");
+ fprintf(thread_stderr, "unknown program name: %s\n", p);
+ ios_exit(1);
+ }
bits = 0;
while ((ch = getopt(argc, argv, "b:cdfv")) != -1)
switch(ch) {
case 'b':
bits = strtol(optarg, &p, 10);
- if (*p)
+ if (*p) {
errx(1, "illegal bit count -- %s", optarg);
+ }
break;
case 'c':
cat = 1;
@@ -132,8 +139,9 @@
exit (eval);
}
- if (cat == 1 && argc > 1)
+ if (cat == 1 && argc > 1) {
errx(1, "the -c option permits only a single file argument");
+ }
for (; *argv; ++argv)
switch(style) {
@@ -254,7 +262,7 @@
if (!force && sb.st_size >= isb.st_size) {
if (verbose)
- (void)fprintf(stderr, "%s: file would grow; left unmodified\n",
+ (void)fprintf(stderr, "compress: %s: file would grow; left unmodified\n",
in);
eval = 2;
if (unlink(out))
@@ -412,9 +420,10 @@
{
int ch, first;
- if (!isatty(fileno(stderr)))
+ if (!ios_isatty(STDERR_FILENO))
return (0);
(void)fprintf(stderr, "overwrite %s? ", fname);
+ fflush(stderr);