forked from holzschu/ios_system
-
Notifications
You must be signed in to change notification settings - Fork 0
/
shell_cmds.patch
1716 lines (1579 loc) · 45.5 KB
/
shell_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 shell_cmds-203/date/date.c shell_cmds/date/date.c
--- shell_cmds-203/date/date.c 2015-11-07 23:19:55.000000000 +0100
+++ shell_cmds/date/date.c 2018-12-08 16:03:31.000000000 +0100
@@ -57,13 +57,15 @@
#include <utmpx.h>
#ifdef __APPLE__
-#include <get_compat.h>
-#else
+// #include <get_compat.h>
+// #else
#define COMPAT_MODE(a,b) (1)
#endif /* __APPLE__ */
#include "extern.h"
#include "vary.h"
+#include <errno.h>
+#include "ios_error.h"
#ifndef TM_YEAR_BASE
#define TM_YEAR_BASE 1900
@@ -74,7 +76,7 @@
#endif
static time_t tval;
-int retval;
+__thread int retval;
static int unix2003_std; /* to determine legacy vs std mode */
static void setthetime(const char *, const char *, int, int);
@@ -84,7 +86,7 @@
static const char *rfc2822_format = "%a, %d %b %Y %T %z";
int
-main(int argc, char *argv[])
+date_main(int argc, char *argv[])
{
struct timezone tz;
int ch, rflag;
@@ -107,6 +109,7 @@
tz.tz_dsttime = tz.tz_minuteswest = 0;
rflag = 0;
jflag = nflag = Rflag = 0;
+ optind = 1; opterr = 1; optreset = 1;
set_timezone = 0;
while ((ch = getopt(argc, argv, "d:f:jnRr:t:uv:")) != -1)
switch((char)ch) {
@@ -161,11 +164,13 @@
* If -d or -t, set the timezone or daylight savings time; this
* doesn't belong here; the kernel should not know about either.
*/
- if (set_timezone && settimeofday(NULL, &tz) != 0)
+ if (set_timezone && settimeofday(NULL, &tz) != 0) {
err(1, "settimeofday (timezone)");
+ }
- if (!rflag && time(&tval) == -1)
+ if (!rflag && time(&tval) == -1) {
err(1, "time");
+ }
format = "%+";
@@ -199,7 +204,7 @@
#endif
badv = vary_apply(v, <);
if (badv) {
- fprintf(stderr, "%s: Cannot apply date adjustment\n",
+ fprintf(thread_stderr, "%s: Cannot apply date adjustment\n",
badv->arg);
vary_destroy(v);
usage();
@@ -214,9 +219,10 @@
setlocale(LC_TIME, "C");
(void)strftime(buf, sizeof(buf), format, <);
- (void)printf("%s\n", buf);
- if (fflush(stdout))
+ (void)fprintf(thread_stdout, "%s\n", buf);
+ if (fflush(thread_stdout)) {
err(1, "stdout");
+ }
/*
* If date/time could not be set/notified in the other hosts as
* determined by netsetval(), a return value 2 is set, which is
@@ -246,11 +252,11 @@
if (fmt != NULL) {
t = strptime(p, fmt, lt);
if (t == NULL) {
- fprintf(stderr, "Failed conversion of ``%s''"
+ fprintf(thread_stderr, "Failed conversion of ``%s''"
" using format ``%s''\n", p, fmt);
badformat();
} else if (*t != '\0')
- fprintf(stderr, "Warning: Ignoring %ld extraneous"
+ fprintf(thread_stderr, "Warning: Ignoring %ld extraneous"
" characters in date string (%s)\n",
(long) strlen(t), t);
} else {
@@ -319,19 +325,21 @@
}
/* convert broken-down time to GMT clock time */
- if ((tval = mktime(lt)) == -1)
+ if ((tval = mktime(lt)) == -1) {
errx(1, "nonexistent time");
+ }
if (!jflag) {
/* set the time */
- if (nflag || netsettime(tval)) {
+ if (nflag /* || netsettime(tval)*/ ) {
utx.ut_type = OLD_TIME;
(void)gettimeofday(&utx.ut_tv, NULL);
pututxline(&utx);
tv.tv_sec = tval;
tv.tv_usec = 0;
- if (settimeofday(&tv, NULL) != 0)
+ if (settimeofday(&tv, NULL) != 0) {
err(1, "settimeofday (timeval)");
+ }
utx.ut_type = NEW_TIME;
(void)gettimeofday(&utx.ut_tv, NULL);
pututxline(&utx);
@@ -346,14 +354,14 @@
static void
badformat(void)
{
- warnx("illegal time format");
+ warnx("illegal time format");
usage();
}
static void
usage(void)
{
- (void)fprintf(stderr, "%s\n%s\n",
+ (void)fprintf(thread_stderr, "%s\n%s\n",
"usage: date [-jnRu] [-d dst] [-r seconds] [-t west] "
"[-v[+|-]val[ymwdHMS]] ... ",
unix2003_std ?
diff -Naur shell_cmds-203/date/extern.h shell_cmds/date/extern.h
--- shell_cmds-203/date/extern.h 2015-11-07 23:19:55.000000000 +0100
+++ shell_cmds/date/extern.h 2018-12-08 16:03:31.000000000 +0100
@@ -30,6 +30,6 @@
* $FreeBSD$
*/
-extern int retval;
+extern __thread int retval;
int netsettime(time_t);
diff -Naur shell_cmds-203/date/vary.c shell_cmds/date/vary.c
--- shell_cmds-203/date/vary.c 2015-11-07 23:19:55.000000000 +0100
+++ shell_cmds/date/vary.c 2018-12-08 16:03:31.000000000 +0100
@@ -31,7 +31,10 @@
#include <time.h>
#include <string.h>
#include <stdlib.h>
+#include <stdio.h>
#include "vary.h"
+#include <errno.h>
+#include "ios_error.h"
struct trans {
int val;
@@ -92,8 +95,9 @@
} else
nextp = &result;
- if ((*nextp = (struct vary *)malloc(sizeof(struct vary))) == NULL)
- err(1, "malloc");
+ if ((*nextp = (struct vary *)malloc(sizeof(struct vary))) == NULL) {
+ err(1, "malloc");
+ }
(*nextp)->arg = arg;
(*nextp)->next = NULL;
return result;
diff -Naur shell_cmds-203/echo/echo.c shell_cmds/echo/echo.c
--- shell_cmds-203/echo/echo.c 2006-12-21 02:07:57.000000000 +0100
+++ shell_cmds/echo/echo.c 2018-12-08 16:03:31.000000000 +0100
@@ -50,6 +50,10 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+// iOS
+#include <stdio.h>
+#include "ios_error.h"
+#include <pthread.h>
/*
* Report an error and exit.
@@ -59,17 +63,18 @@
errexit(const char *prog, const char *reason)
{
char *errstr = strerror(errno);
- write(STDERR_FILENO, prog, strlen(prog));
- write(STDERR_FILENO, ": ", 2);
- write(STDERR_FILENO, reason, strlen(reason));
- write(STDERR_FILENO, ": ", 2);
- write(STDERR_FILENO, errstr, strlen(errstr));
- write(STDERR_FILENO, "\n", 1);
- exit(1);
+ fprintf(thread_stderr, "%s: %s: %s\n", prog, reason, errstr);
+// write(STDERR_FILENO, prog, strlen(prog));
+// write(STDERR_FILENO, ": ", 2);
+// write(STDERR_FILENO, reason, strlen(reason));
+// write(STDERR_FILENO, ": ", 2);
+// write(STDERR_FILENO, errstr, strlen(errstr));
+// write(STDERR_FILENO, "\n", 1);
+ exit(1);
}
int
-main(int argc, char *argv[])
+echo_main(int argc, char *argv[])
{
int nflag; /* if not set, output a trailing newline. */
int veclen; /* number of writev arguments. */
@@ -128,8 +133,14 @@
int nwrite;
nwrite = (veclen > IOV_MAX) ? IOV_MAX : veclen;
- if (writev(STDOUT_FILENO, iov, nwrite) == -1)
- errexit(progname, "write");
+ // if (writev(STDOUT_FILENO, iov, nwrite) == -1)
+ // errexit(progname, "write");
+ struct iovec *cp = iov;
+ for (int i = 0; i < nwrite; i++) {
+ if (fprintf(thread_stdout, "%s", (char*)(cp->iov_base)) == -1)
+ errexit(progname, "write");
+ cp++;
+ }
iov += nwrite;
veclen -= nwrite;
}
diff -Naur shell_cmds-203/env/env.c shell_cmds/env/env.c
--- shell_cmds-203/env/env.c 2014-08-05 00:47:11.000000000 +0200
+++ shell_cmds/env/env.c 2018-12-08 16:03:31.000000000 +0100
@@ -50,15 +50,18 @@
#include <unistd.h>
#include "envopts.h"
+#include "ios_error.h"
extern char **environ;
-int env_verbosity;
+__thread int env_verbosity;
static void usage(void);
+
+
int
-main(int argc, char **argv)
+env_main(int argc, char **argv)
{
char *altpath, **ep, *p, **parg;
char *cleanenv[1];
@@ -67,6 +70,7 @@
altpath = NULL;
want_clear = 0;
+ optind = 1; opterr = 1; optreset = 1;
while ((ch = getopt(argc, argv, "-iP:S:u:v")) != -1)
switch(ch) {
case '-':
@@ -85,15 +89,16 @@
break;
case 'u':
if (env_verbosity)
- fprintf(stderr, "#env unset:\t%s\n", optarg);
+ fprintf(thread_stderr, "#env unset:\t%s\n", optarg);
rtrn = unsetenv(optarg);
- if (rtrn == -1)
+ if (rtrn == -1) {
err(EXIT_FAILURE, "unsetenv %s", optarg);
+ }
break;
case 'v':
env_verbosity++;
if (env_verbosity > 1)
- fprintf(stderr, "#env verbosity now at %d\n",
+ fprintf(thread_stderr, "#env verbosity now at %d\n",
env_verbosity);
break;
case '?':
@@ -104,41 +109,67 @@
environ = cleanenv;
cleanenv[0] = NULL;
if (env_verbosity)
- fprintf(stderr, "#env clearing environ\n");
+ fprintf(thread_stderr, "#env clearing environ\n");
}
for (argv += optind; *argv && (p = strchr(*argv, '=')); ++argv) {
if (env_verbosity)
- fprintf(stderr, "#env setenv:\t%s\n", *argv);
+ fprintf(thread_stderr, "#env setenv:\t%s\n", *argv);
*p = '\0';
rtrn = setenv(*argv, p + 1, 1);
*p = '=';
- if (rtrn == -1)
+ if (rtrn == -1) {
err(EXIT_FAILURE, "setenv %s", *argv);
+ }
}
if (*argv) {
if (altpath)
search_paths(altpath, argv);
if (env_verbosity) {
- fprintf(stderr, "#env executing:\t%s\n", *argv);
+ fprintf(thread_stderr, "#env executing:\t%s\n", *argv);
for (parg = argv, argc = 0; *parg; parg++, argc++)
- fprintf(stderr, "#env arg[%d]=\t'%s'\n",
+ fprintf(thread_stderr, "#env arg[%d]=\t'%s'\n",
argc, *parg);
if (env_verbosity > 1)
sleep(1);
}
- execvp(*argv, argv);
- err(errno == ENOENT ? 127 : 126, "%s", *argv);
+ execvp(*argv, argv);
+ err(errno == ENOENT ? 127 : 126, "%s", *argv);
}
for (ep = environ; *ep; ep++)
- (void)printf("%s\n", *ep);
+ (void)fprintf(thread_stdout, "%s\n", *ep);
exit(0);
}
static void
usage(void)
{
- (void)fprintf(stderr,
+ (void)fprintf(thread_stderr,
"usage: env [-iv] [-P utilpath] [-S string] [-u name]\n"
" [name=value ...] [utility [argument ...]]\n");
exit(1);
}
+
+
+int setenv_main(int argc, char** argv) {
+ if (argc <= 1) return env_main(argc, argv);
+ if (argc > 3) {
+ fprintf(thread_stderr, "setenv: Too many arguments\n"); fflush(thread_stderr);
+ return 0;
+ }
+ // setenv VARIABLE value
+ if (argv[2] != NULL) setenv(argv[1], argv[2], 1);
+ else setenv(argv[1], "", 1); // if there's no value, pass an empty string instead of a null pointer
+ return 0;
+}
+
+int unsetenv_main(int argc, char** argv) {
+ if (argc <= 1) {
+ fprintf(thread_stderr, "unsetenv: Too few arguments\n"); fflush(thread_stderr);
+ return 0;
+ }
+ // unsetenv acts on all parameters
+ for (int i = 1; i < argc; i++) unsetenv(argv[i]);
+ return 0;
+}
+
+
diff -Naur shell_cmds-203/env/envopts.c shell_cmds/env/envopts.c
--- shell_cmds-203/env/envopts.c 2014-08-05 00:47:11.000000000 +0200
+++ shell_cmds/env/envopts.c 2018-12-08 16:03:31.000000000 +0100
@@ -42,6 +42,7 @@
#include <unistd.h>
#include "envopts.h"
+#include "ios_error.h"
static const char *
expand_vars(int in_thisarg, char **thisarg_p, char **dest_p,
@@ -73,7 +74,7 @@
(getuid() != 0 ||
(fin.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)) != 0)) {
if (env_verbosity > 1)
- fprintf(stderr, "#env matched:\t'%s'\n", candidate);
+ fprintf(thread_stderr, "#env matched:\t'%s'\n", candidate);
return (1);
}
return (0);
@@ -106,8 +107,8 @@
return;
if (env_verbosity > 1) {
- fprintf(stderr, "#env Searching:\t'%s'\n", path);
- fprintf(stderr, "#env for file:\t'%s'\n", filename);
+ fprintf(thread_stderr, "#env Searching:\t'%s'\n", path);
+ fprintf(thread_stderr, "#env for file:\t'%s'\n", filename);
}
fqname = NULL;
@@ -285,9 +286,10 @@
* This would not make sense if found in the
* middle of a quoted string.
*/
- if (in_dq)
- errx(1, "Sequence '\\%c' is not allowed"
- " in quoted strings", *src);
+ if (in_dq) {
+ errx(1, "Sequence '\\%c' is not allowed"
+ " in quoted strings\n", *src);
+ }
goto str_done;
case 'f':
copychar = '\f';
@@ -307,9 +309,10 @@
default:
if (isspacech(*src))
copychar = *src;
- else
- errx(1, "Invalid sequence '\\%c' in -S",
+ else {
+ errx(1, "Invalid sequence '\\%c' in -S",
*src);
+ }
}
break;
default:
@@ -355,15 +358,15 @@
*dest = '\0';
*nextarg = NULL;
if (in_dq || in_sq) {
- errx(1, "No terminating quote for string: %.*s%s",
- bq_destlen, *(nextarg - 1), bq_src);
- }
+ errx(1, "No terminating quote for string: %.*s%s",
+ bq_destlen, *(nextarg - 1), bq_src);
+ }
if (env_verbosity > 1) {
- fprintf(stderr, "#env split -S:\t'%s'\n", str);
+ fprintf(thread_stderr, "#env split -S:\t'%s'\n", str);
oldarg = newargv + 1;
- fprintf(stderr, "#env into:\t'%s'\n", *oldarg);
+ fprintf(thread_stderr, "#env into:\t'%s'\n", *oldarg);
for (oldarg++; *oldarg; oldarg++)
- fprintf(stderr, "#env &\t'%s'\n", *oldarg);
+ fprintf(thread_stderr, "#env &\t'%s'\n", *oldarg);
}
/* Copy the unprocessed arg-pointers from the original array */
@@ -403,9 +406,10 @@
if (*vend == '}')
bad_reference = 0;
}
- if (bad_reference)
- errx(1, "Only ${VARNAME} expansion is supported, error at: %s",
- *src_p);
+ if (bad_reference) {
+ errx(1, "Only ${VARNAME} expansion is supported, error at: %s",
+ *src_p);
+ }
/*
* We now know we have a valid environment variable name, so update
@@ -420,7 +424,7 @@
vvalue = getenv(vname);
if (vvalue == NULL || *vvalue == '\0') {
if (env_verbosity > 2)
- fprintf(stderr,
+ fprintf(thread_stderr,
"#env replacing ${%s} with null string\n",
vname);
free(vname);
@@ -428,7 +432,7 @@
}
if (env_verbosity > 2)
- fprintf(stderr, "#env expanding ${%s} into '%s'\n", vname,
+ fprintf(thread_stderr, "#env expanding ${%s} into '%s'\n", vname,
vvalue);
/*
diff -Naur shell_cmds-203/env/envopts.h shell_cmds/env/envopts.h
--- shell_cmds-203/env/envopts.h 2014-08-05 00:47:11.000000000 +0200
+++ shell_cmds/env/envopts.h 2018-12-08 16:03:31.000000000 +0100
@@ -34,4 +34,4 @@
void split_spaces(const char *str, int *origind, int *origc,
char ***origv);
-extern int env_verbosity;
+extern __thread int env_verbosity;
diff -Naur shell_cmds-203/id/id.c shell_cmds/id/id.c
--- shell_cmds-203/id/id.c 2014-02-18 21:44:21.000000000 +0100
+++ shell_cmds/id/id.c 2018-12-08 16:03:31.000000000 +0100
@@ -62,26 +62,27 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+#include "ios_error.h"
-void id_print(struct passwd *, int, int, int);
-void pline(struct passwd *);
-void pretty(struct passwd *);
-void auditid(void);
-void fullname(struct passwd *);
-void group(struct passwd *, int);
-void maclabel(void);
-void usage(void);
+static void id_print(struct passwd *, int, int, int);
+static void pline(struct passwd *);
+static void pretty(struct passwd *);
+static void auditid(void);
+static void fullname(struct passwd *);
+static void group(struct passwd *, int);
+static void maclabel(void);
+static void usage(void);
struct passwd *who(char *);
-int isgroups, iswhoami;
+static int isgroups, iswhoami;
#ifdef __APPLE__
// SPI for 5235093
-int32_t getgrouplist_2(const char *, gid_t, gid_t **);
+// int32_t getgrouplist_2(const char *, gid_t, gid_t **);
#endif
int
-main(int argc, char *argv[])
+id_main(int argc, char *argv[])
{
struct group *gr;
struct passwd *pw;
@@ -93,6 +94,10 @@
Gflag = Mflag = Pflag = gflag = nflag = pflag = rflag = uflag = 0;
Aflag = 0;
Fflag = 0;
+ optind = 1; opterr = 1; optreset = 1;
+ // Initialize:
+ isgroups = 0;
+ iswhoami = 0;
myname = strrchr(argv[0], '/');
myname = (myname != NULL) ? myname + 1 : argv[0];
@@ -183,18 +188,18 @@
if (gflag) {
id = pw ? pw->pw_gid : rflag ? getgid() : getegid();
if (nflag && (gr = getgrgid(id)))
- (void)printf("%s\n", gr->gr_name);
+ (void)fprintf(thread_stdout, "%s\n", gr->gr_name);
else
- (void)printf("%u\n", id);
+ (void)fprintf(thread_stdout, "%u\n", id);
exit(0);
}
if (uflag) {
id = pw ? pw->pw_uid : rflag ? getuid() : geteuid();
if (nflag && (pw = getpwuid(id)))
- (void)printf("%s\n", pw->pw_name);
+ (void)fprintf(thread_stdout, "%s\n", pw->pw_name);
else
- (void)printf("%u\n", id);
+ (void)fprintf(thread_stdout, "%u\n", id);
exit(0);
}
@@ -237,34 +242,35 @@
char *login;
if (pw) {
- (void)printf("uid\t%s\n", pw->pw_name);
- (void)printf("groups\t");
+ (void)fprintf(thread_stdout, "uid\t%s\n", pw->pw_name);
+ (void)fprintf(thread_stdout, "groups\t");
group(pw, 1);
} else {
- if ((login = getlogin()) == NULL)
+ if ((login = getlogin()) == NULL) {
err(1, "getlogin");
+ }
pw = getpwuid(rid = getuid());
if (pw == NULL || strcmp(login, pw->pw_name))
- (void)printf("login\t%s\n", login);
+ (void)fprintf(thread_stdout, "login\t%s\n", login);
if (pw)
- (void)printf("uid\t%s\n", pw->pw_name);
+ (void)fprintf(thread_stdout, "uid\t%s\n", pw->pw_name);
else
- (void)printf("uid\t%u\n", rid);
+ (void)fprintf(thread_stdout, "uid\t%u\n", rid);
if ((eid = geteuid()) != rid) {
if ((pw = getpwuid(eid)))
- (void)printf("euid\t%s\n", pw->pw_name);
+ (void)fprintf(thread_stdout, "euid\t%s\n", pw->pw_name);
else
- (void)printf("euid\t%u\n", eid);
+ (void)fprintf(thread_stdout, "euid\t%u\n", eid);
}
if ((rid = getgid()) != (eid = getegid())) {
if ((gr = getgrgid(rid)))
- (void)printf("rgid\t%s\n", gr->gr_name);
+ (void)fprintf(thread_stdout, "rgid\t%s\n", gr->gr_name);
else
- (void)printf("rgid\t%u\n", rid);
+ (void)fprintf(thread_stdout, "rgid\t%u\n", rid);
}
- (void)printf("groups\t");
+ (void)fprintf(thread_stdout, "groups\t");
group(NULL, 1);
}
}
@@ -303,7 +309,7 @@
if (use_ggl && pw != NULL) {
#ifdef __APPLE__
// 5235093
- ngroups = getgrouplist_2(pw->pw_name, gid, &groups);
+ // ngroups = getgrouplist_2(pw->pw_name, gid, &groups);
#else
ngroups = NGROUPS + 1;
getgrouplist(pw->pw_name, gid, groups, &ngroups);
@@ -318,37 +324,37 @@
#ifdef __APPLE__
if (ngroups < 0)
- warn("failed to retrieve group list");
+ warn("failed to retrieve group list");
#endif
if (pw != NULL)
- printf("uid=%u(%s)", uid, pw->pw_name);
+ fprintf(thread_stdout, "uid=%u(%s)", uid, pw->pw_name);
else
- printf("uid=%u", getuid());
- printf(" gid=%u", gid);
+ fprintf(thread_stdout, "uid=%u", getuid());
+ fprintf(thread_stdout, " gid=%u", gid);
if ((gr = getgrgid(gid)))
- (void)printf("(%s)", gr->gr_name);
+ (void)fprintf(thread_stdout, "(%s)", gr->gr_name);
if (p_euid && (euid = geteuid()) != uid) {
- (void)printf(" euid=%u", euid);
+ (void)fprintf(thread_stdout, " euid=%u", euid);
if ((pw = getpwuid(euid)))
- (void)printf("(%s)", pw->pw_name);
+ (void)fprintf(thread_stdout, "(%s)", pw->pw_name);
}
if (p_egid && (egid = getegid()) != gid) {
- (void)printf(" egid=%u", egid);
+ (void)fprintf(thread_stdout, " egid=%u", egid);
if ((gr = getgrgid(egid)))
- (void)printf("(%s)", gr->gr_name);
+ (void)fprintf(thread_stdout, "(%s)", gr->gr_name);
}
fmt = " groups=%u";
for (lastgid = -1, cnt = 0; cnt < ngroups; ++cnt) {
if (lastgid == (gid = groups[cnt]))
continue;
- printf(fmt, gid);
+ fprintf(thread_stdout, fmt, gid);
fmt = ",%u";
if ((gr = getgrgid(gid)))
- printf("(%s)", gr->gr_name);
+ fprintf(thread_stdout, "(%s)", gr->gr_name);
lastgid = gid;
}
- printf("\n");
+ fprintf(thread_stdout, "\n");
#ifdef __APPLE__
free(groups);
#endif
@@ -360,13 +366,14 @@
{
auditinfo_addr_t auditinfo;
- if (getaudit_addr(&auditinfo, sizeof(auditinfo)) < 0)
+ if (getaudit_addr(&auditinfo, sizeof(auditinfo)) < 0) {
err(1, "getaudit");
- printf("auid=%d\n", auditinfo.ai_auid);
- printf("mask.success=0x%08x\n", auditinfo.ai_mask.am_success);
- printf("mask.failure=0x%08x\n", auditinfo.ai_mask.am_failure);
- printf("termid.port=0x%08x\n", auditinfo.ai_termid.at_port);
- printf("asid=%d\n", auditinfo.ai_asid);
+ }
+ fprintf(thread_stdout, "auid=%d\n", auditinfo.ai_auid);
+ fprintf(thread_stdout, "mask.success=0x%08x\n", auditinfo.ai_mask.am_success);
+ fprintf(thread_stdout, "mask.failure=0x%08x\n", auditinfo.ai_mask.am_failure);
+ fprintf(thread_stdout, "termid.port=0x%08x\n", auditinfo.ai_termid.at_port);
+ fprintf(thread_stdout, "asid=%d\n", auditinfo.ai_asid);
}
#endif
@@ -375,11 +382,12 @@
{
if (!pw) {
- if ((pw = getpwuid(getuid())) == NULL)
+ if ((pw = getpwuid(getuid())) == NULL) {
err(1, "getpwuid");
+ }
}
- (void)printf("%s\n", pw->pw_gecos);
+ (void)fprintf(thread_stdout, "%s\n", pw->pw_gecos);
}
void
@@ -403,7 +411,7 @@
if (pw) {
#ifdef __APPLE__
// 5235093
- ngroups = getgrouplist_2(pw->pw_name, pw->pw_gid, &groups);
+ // ngroups = getgrouplist_2(pw->pw_name, pw->pw_gid, &groups);
#else
ngroups = NGROUPS + 1;
(void) getgrouplist(pw->pw_name, pw->pw_gid, groups, &ngroups);
@@ -421,18 +429,18 @@
continue;
if (nflag) {
if ((gr = getgrgid(id)))
- (void)printf(fmt, gr->gr_name);
+ (void)fprintf(thread_stdout, fmt, gr->gr_name);
else
- (void)printf(*fmt == ' ' ? " %u" : "%u",
+ (void)fprintf(thread_stdout, *fmt == ' ' ? " %u" : "%u",
id);
fmt = " %s";
} else {
- (void)printf(fmt, id);
+ (void)fprintf(thread_stdout, fmt, id);
fmt = " %u";
}
lastid = id;
}
- (void)printf("\n");
+ (void)fprintf(thread_stdout, "\n");
#ifdef __APPLE__
free(groups);
#endif
@@ -449,7 +457,7 @@
int error;
error = mac_prepare_process_label(&label);
- if (error == -1)
+ if (error == -1)
errx(1, "mac_prepare_type: %s", strerror(errno));
error = mac_get_proc(label);
@@ -460,7 +468,7 @@
if (error == -1)
errx(1, "mac_to_text: %s", strerror(errno));
- (void)printf("%s\n", string);
+ (void)fprintf(thread_stdout, "%s\n", string);
mac_free(label);
free(string);
#endif /* __APPLE__ */
@@ -483,6 +491,7 @@
if (*u && !*ep && (pw = getpwuid(id)))
return(pw);
errx(1, "%s: no such user", u);
+ return NULL; // keep compiler happy
/* NOTREACHED */
}
@@ -491,11 +500,12 @@
{
if (!pw) {
- if ((pw = getpwuid(getuid())) == NULL)
+ if ((pw = getpwuid(getuid())) == NULL) {
err(1, "getpwuid");
+ }
}
- (void)printf("%s:%s:%d:%d:%s:%ld:%ld:%s:%s:%s\n", pw->pw_name,
+ (void)fprintf(thread_stdout, "%s:%s:%d:%d:%s:%ld:%ld:%s:%s:%s\n", pw->pw_name,
pw->pw_passwd, pw->pw_uid, pw->pw_gid, pw->pw_class,
(long)pw->pw_change, (long)pw->pw_expire, pw->pw_gecos,
pw->pw_dir, pw->pw_shell);
@@ -507,11 +517,11 @@
{
if (isgroups)
- (void)fprintf(stderr, "usage: groups [user]\n");
+ (void)fprintf(thread_stderr, "usage: groups [user]\n");
else if (iswhoami)
- (void)fprintf(stderr, "usage: whoami\n");
+ (void)fprintf(thread_stderr, "usage: whoami\n");
else
- (void)fprintf(stderr, "%s\n%s%s\n%s\n%s\n%s\n%s\n%s\n%s\n",
+ (void)fprintf(thread_stderr, "%s\n%s%s\n%s\n%s\n%s\n%s\n%s\n%s\n",
"usage: id [user]",
#ifdef USE_BSM_AUDIT
" id -A\n",
diff -Naur shell_cmds-203/printenv/printenv.c shell_cmds/printenv/printenv.c
--- shell_cmds-203/printenv/printenv.c 2014-08-05 00:47:11.000000000 +0200
+++ shell_cmds/printenv/printenv.c 2018-12-08 16:03:31.000000000 +0100
@@ -48,8 +48,9 @@
#include <stdio.h>
#include <string.h>
#include <unistd.h>
+#include "ios_error.h"
-void usage(void);
+static void usage(void);
extern char **environ;
/*
@@ -59,11 +60,12 @@
* February, 1979
*/
int
-main(int argc, char *argv[])
+printenv_main(int argc, char *argv[])
{
char *cp, **ep;
size_t len;
int ch;
+ optind = 1; opterr = 1; optreset = 1;
while ((ch = getopt(argc, argv, "")) != -1)
switch(ch) {
@@ -76,7 +78,7 @@
if (argc == 0) {
for (ep = environ; *ep; ep++)
- (void)printf("%s\n", *ep);
+ (void)fprintf(thread_stdout, "%s\n", *ep);
exit(0);
}
len = strlen(*argv);
@@ -84,16 +86,16 @@
if (!memcmp(*ep, *argv, len)) {
cp = *ep + len;
if (!*cp || *cp == '=') {
- (void)printf("%s\n", *cp ? cp + 1 : cp);
+ (void)fprintf(thread_stdout, "%s\n", *cp ? cp + 1 : cp);
exit(0);
}
}
exit(1);
}
-void
+static void
usage(void)
{
- (void)fprintf(stderr, "usage: printenv [name]\n");
+ (void)fprintf(thread_stderr, "usage: printenv [name]\n");
exit(1);
}
diff -Naur shell_cmds-203/pwd/pwd.c shell_cmds/pwd/pwd.c
--- shell_cmds-203/pwd/pwd.c 2006-09-12 00:14:13.000000000 +0200
+++ shell_cmds/pwd/pwd.c 2018-12-08 16:03:31.000000000 +0100
@@ -50,16 +50,19 @@
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
+#include <string.h>
+#include "ios_error.h"
static char *getcwd_logical(void);
-void usage(void);
+static void usage(void);
int
-main(int argc, char *argv[])
+pwd_main(int argc, char *argv[])
{
int physical;
int ch;
char *p;
+ optind = 1; opterr = 1; optreset = 1;
// 4207130
physical = 0;
@@ -90,18 +93,19 @@
*/
if ((!physical && (p = getcwd_logical()) != NULL) ||
((physical || errno == ENOENT) && (p = getcwd(NULL, 0)) != NULL))
- printf("%s\n", p);
- else
+ fprintf(thread_stdout, "%s\n", p);
+ else {
err(1, ".");
-
- exit(0);
+ }
+
+ exit(0);
}
-void
+static void
usage(void)
{
- (void)fprintf(stderr, "usage: pwd [-L | -P]\n");
+ (void)fprintf(thread_stderr, "usage: pwd [-L | -P]\n");
exit(1);
}
diff -Naur shell_cmds-203/tee/tee.c shell_cmds/tee/tee.c
--- shell_cmds-203/tee/tee.c 1999-04-23 04:44:50.000000000 +0200
+++ shell_cmds/tee/tee.c 2018-12-08 16:03:31.000000000 +0100
@@ -57,29 +57,37 @@
#include <string.h>
#include <locale.h>
#include <err.h>
+#include "ios_error.h"
typedef struct _list {
struct _list *next;
- int fd;
+ FILE* stream;
+ // int fd;
char *name;
} LIST;
-LIST *head;
+static LIST *head;
-void add __P((int, char *));
-int main __P((int, char **));
+static void add __P((FILE*, char *));
+int tee_main __P((int, char **));
int
-main(argc, argv)
+tee_main(argc, argv)
int argc;
char *argv[];
{
LIST *p;
- int n, fd, rval, wval;
+ int n, rval;
+ size_t wval;
+ FILE* fd;
char *bp;
int append, ch, exitval;
char *buf;
#define BSIZE (8 * 1024)
-
+ // iOS: initialize flags:
+ append = 0; exitval = 0;
+ rval = 0; wval = 0; fd = 0; n = 0; ch = 0;
+
+
setlocale(LC_ALL, "");
append = 0;
@@ -93,32 +101,32 @@
break;
case '?':
default:
- (void)fprintf(stderr, "usage: tee [-ai] [file ...]\n");
+ (void)fprintf(thread_stderr, "usage: tee [-ai] [file ...]\n");
exit(1);
}
argv += optind;
argc -= optind;
- if ((buf = malloc((size_t)BSIZE)) == NULL)
- err(1, "malloc");
+ if ((buf = malloc((size_t)BSIZE)) == NULL) {
+ err(1, "malloc");
+ }
- add(STDOUT_FILENO, "stdout");
+ add(thread_stdout, "stdout");
for (exitval = 0; *argv; ++argv)
- if ((fd = open(*argv, append ? O_WRONLY|O_CREAT|O_APPEND :
- O_WRONLY|O_CREAT|O_TRUNC, DEFFILEMODE)) < 0) {
- warn("%s", *argv);
+ if ((fd = fopen(*argv, append ? "a" : "w")) < 0) {
+ warn("%s", *argv);
exitval = 1;
} else
add(fd, *argv);
- while ((rval = read(STDIN_FILENO, buf, BSIZE)) > 0)
+ while ((rval = read(fileno(thread_stdin), buf, BSIZE)) > 0)
for (p = head; p; p = p->next) {
n = rval;
bp = buf;
do {
- if ((wval = write(p->fd, bp, n)) == -1) {
- warn("%s", p->name);
+ if ((wval = fwrite(bp, 1, n, p->stream)) != n) {
+ warn("%s", p->name);
exitval = 1;
break;
}
@@ -126,30 +134,41 @@
} while (n -= wval);
}
if (rval < 0) {
- warn("read");
+ warn("read");
exitval = 1;
}