aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Kraai <kraai@debian.org>2001-12-20 23:13:26 +0000
committerMatt Kraai <kraai@debian.org>2001-12-20 23:13:26 +0000
commit1f0c43668ac332cbcf61cbdf71844799327cc8b9 (patch)
tree97414e991363fa613f229019d697280cae1097e0
parent31c73af656813b5cadcb1dd27adb9bbc62a98987 (diff)
downloadbusybox-w32-1f0c43668ac332cbcf61cbdf71844799327cc8b9.tar.gz
busybox-w32-1f0c43668ac332cbcf61cbdf71844799327cc8b9.tar.bz2
busybox-w32-1f0c43668ac332cbcf61cbdf71844799327cc8b9.zip
Remove `== TRUE' tests and convert `!= TRUE' and `== FALSE' tests to use !.
Diffstat
-rw-r--r--archival/bunzip2.c88
-rw-r--r--archival/dpkg.c6
-rw-r--r--archival/gunzip.c2
-rw-r--r--archival/libunarchive/unarchive.c4
-rw-r--r--archival/tar.c8
-rw-r--r--coreutils/cat.c2
-rw-r--r--coreutils/chgrp.c4
-rw-r--r--coreutils/chmod.c6
-rw-r--r--coreutils/chown.c4
-rw-r--r--coreutils/ls.c2
-rw-r--r--coreutils/touch.c4
-rw-r--r--editors/vi.c40
-rw-r--r--findutils/find.c8
-rw-r--r--init/init.c4
-rw-r--r--libbb/isdirectory.c2
-rw-r--r--libbb/read_package_field.c2
-rw-r--r--libbb/recursive_action.c20
-rw-r--r--modutils/insmod.c8
-rw-r--r--networking/telnet.c2
-rw-r--r--procps/kill.c2
-rw-r--r--shell/ash.c4
-rw-r--r--shell/cmdedit.c4
-rw-r--r--shell/lash.c2
-rw-r--r--sysklogd/klogd.c2
-rw-r--r--sysklogd/syslogd.c12
-rw-r--r--util-linux/mount.c32
-rw-r--r--util-linux/umount.c14
27 files changed, 144 insertions, 144 deletions
diff --git a/archival/bunzip2.c b/archival/bunzip2.c
index c07fe1892..b0a11fd83 100644
--- a/archival/bunzip2.c
+++ b/archival/bunzip2.c
@@ -626,7 +626,7 @@ int BZ2_decompress(DState *s)
626 switch (switch_val) { 626 switch (switch_val) {
627 case BZ_X_MAGIC_1: 627 case BZ_X_MAGIC_1:
628 s->state = BZ_X_MAGIC_1; 628 s->state = BZ_X_MAGIC_1;
629 if (get_bits(s, &uc, 8) == FALSE) { 629 if (! get_bits(s, &uc, 8)) {
630 retVal = BZ_OK; 630 retVal = BZ_OK;
631 goto save_state_and_return; 631 goto save_state_and_return;
632 } 632 }
@@ -637,7 +637,7 @@ int BZ2_decompress(DState *s)
637 637
638 case BZ_X_MAGIC_2: 638 case BZ_X_MAGIC_2:
639 s->state = BZ_X_MAGIC_2; 639 s->state = BZ_X_MAGIC_2;
640 if (get_bits(s, &uc, 8) == FALSE) { 640 if (! get_bits(s, &uc, 8)) {
641 retVal = BZ_OK; 641 retVal = BZ_OK;
642 goto save_state_and_return; 642 goto save_state_and_return;
643 } 643 }
@@ -648,7 +648,7 @@ int BZ2_decompress(DState *s)
648 648
649 case BZ_X_MAGIC_3: 649 case BZ_X_MAGIC_3:
650 s->state = BZ_X_MAGIC_3; 650 s->state = BZ_X_MAGIC_3;
651 if (get_bits(s, &uc, 8) == FALSE) { 651 if (! get_bits(s, &uc, 8)) {
652 retVal = BZ_OK; 652 retVal = BZ_OK;
653 goto save_state_and_return; 653 goto save_state_and_return;
654 } 654 }
@@ -659,7 +659,7 @@ int BZ2_decompress(DState *s)
659 659
660 case BZ_X_MAGIC_4: 660 case BZ_X_MAGIC_4:
661 s->state = BZ_X_MAGIC_4; 661 s->state = BZ_X_MAGIC_4;
662 if (get_bits(s, &s->blockSize100k, 8) == FALSE) { 662 if (! get_bits(s, &s->blockSize100k, 8)) {
663 retVal = BZ_OK; 663 retVal = BZ_OK;
664 goto save_state_and_return; 664 goto save_state_and_return;
665 } 665 }
@@ -687,7 +687,7 @@ int BZ2_decompress(DState *s)
687 687
688 case BZ_X_BLKHDR_1: 688 case BZ_X_BLKHDR_1:
689 s->state = BZ_X_BLKHDR_1; 689 s->state = BZ_X_BLKHDR_1;
690 if (get_bits(s, &uc, 8) == FALSE) { 690 if (! get_bits(s, &uc, 8)) {
691 retVal = BZ_OK; 691 retVal = BZ_OK;
692 goto save_state_and_return; 692 goto save_state_and_return;
693 } 693 }
@@ -702,7 +702,7 @@ int BZ2_decompress(DState *s)
702 702
703 case BZ_X_BLKHDR_2: 703 case BZ_X_BLKHDR_2:
704 s->state = BZ_X_BLKHDR_2; 704 s->state = BZ_X_BLKHDR_2;
705 if (get_bits(s, &uc, 8) == FALSE) { 705 if (! get_bits(s, &uc, 8)) {
706 retVal = BZ_OK; 706 retVal = BZ_OK;
707 goto save_state_and_return; 707 goto save_state_and_return;
708 } 708 }
@@ -713,7 +713,7 @@ int BZ2_decompress(DState *s)
713 713
714 case BZ_X_BLKHDR_3: 714 case BZ_X_BLKHDR_3:
715 s->state = BZ_X_BLKHDR_3; 715 s->state = BZ_X_BLKHDR_3;
716 if (get_bits(s, &uc, 8) == FALSE) { 716 if (! get_bits(s, &uc, 8)) {
717 retVal = BZ_OK; 717 retVal = BZ_OK;
718 goto save_state_and_return; 718 goto save_state_and_return;
719 } 719 }
@@ -724,7 +724,7 @@ int BZ2_decompress(DState *s)
724 724
725 case BZ_X_BLKHDR_4: 725 case BZ_X_BLKHDR_4:
726 s->state = BZ_X_BLKHDR_4; 726 s->state = BZ_X_BLKHDR_4;
727 if (get_bits(s, &uc, 8) == FALSE) { 727 if (! get_bits(s, &uc, 8)) {
728 retVal = BZ_OK; 728 retVal = BZ_OK;
729 goto save_state_and_return; 729 goto save_state_and_return;
730 } 730 }
@@ -735,7 +735,7 @@ int BZ2_decompress(DState *s)
735 735
736 case BZ_X_BLKHDR_5: 736 case BZ_X_BLKHDR_5:
737 s->state = BZ_X_BLKHDR_5; 737 s->state = BZ_X_BLKHDR_5;
738 if (get_bits(s, &uc, 8) == FALSE) { 738 if (! get_bits(s, &uc, 8)) {
739 retVal = BZ_OK; 739 retVal = BZ_OK;
740 goto save_state_and_return; 740 goto save_state_and_return;
741 } 741 }
@@ -746,7 +746,7 @@ int BZ2_decompress(DState *s)
746 746
747 case BZ_X_BLKHDR_6: 747 case BZ_X_BLKHDR_6:
748 s->state = BZ_X_BLKHDR_6; 748 s->state = BZ_X_BLKHDR_6;
749 if (get_bits(s, &uc, 8) == FALSE) { 749 if (! get_bits(s, &uc, 8)) {
750 retVal = BZ_OK; 750 retVal = BZ_OK;
751 goto save_state_and_return; 751 goto save_state_and_return;
752 } 752 }
@@ -763,7 +763,7 @@ int BZ2_decompress(DState *s)
763 763
764 case BZ_X_BCRC_1: 764 case BZ_X_BCRC_1:
765 s->state = BZ_X_BCRC_1; 765 s->state = BZ_X_BCRC_1;
766 if (get_bits(s, &uc, 8) == FALSE) { 766 if (! get_bits(s, &uc, 8)) {
767 retVal = BZ_OK; 767 retVal = BZ_OK;
768 goto save_state_and_return; 768 goto save_state_and_return;
769 } 769 }
@@ -771,7 +771,7 @@ int BZ2_decompress(DState *s)
771 771
772 case BZ_X_BCRC_2: 772 case BZ_X_BCRC_2:
773 s->state = BZ_X_BCRC_2; 773 s->state = BZ_X_BCRC_2;
774 if (get_bits(s, &uc, 8) == FALSE) { 774 if (! get_bits(s, &uc, 8)) {
775 retVal = BZ_OK; 775 retVal = BZ_OK;
776 goto save_state_and_return; 776 goto save_state_and_return;
777 } 777 }
@@ -779,7 +779,7 @@ int BZ2_decompress(DState *s)
779 779
780 case BZ_X_BCRC_3: 780 case BZ_X_BCRC_3:
781 s->state = BZ_X_BCRC_3; 781 s->state = BZ_X_BCRC_3;
782 if (get_bits(s, &uc, 8) == FALSE) { 782 if (! get_bits(s, &uc, 8)) {
783 retVal = BZ_OK; 783 retVal = BZ_OK;
784 goto save_state_and_return; 784 goto save_state_and_return;
785 } 785 }
@@ -787,7 +787,7 @@ int BZ2_decompress(DState *s)
787 787
788 case BZ_X_BCRC_4: 788 case BZ_X_BCRC_4:
789 s->state = BZ_X_BCRC_4; 789 s->state = BZ_X_BCRC_4;
790 if (get_bits(s, &uc, 8) == FALSE) { 790 if (! get_bits(s, &uc, 8)) {
791 retVal = BZ_OK; 791 retVal = BZ_OK;
792 goto save_state_and_return; 792 goto save_state_and_return;
793 } 793 }
@@ -799,7 +799,7 @@ int BZ2_decompress(DState *s)
799 int tmp = s->blockRandomised; 799 int tmp = s->blockRandomised;
800 const int ret = get_bits(s, &tmp, 1); 800 const int ret = get_bits(s, &tmp, 1);
801 s->blockRandomised = tmp; 801 s->blockRandomised = tmp;
802 if (ret == FALSE) { 802 if (! ret) {
803 retVal = BZ_OK; 803 retVal = BZ_OK;
804 goto save_state_and_return; 804 goto save_state_and_return;
805 } 805 }
@@ -809,7 +809,7 @@ int BZ2_decompress(DState *s)
809 809
810 case BZ_X_ORIGPTR_1: 810 case BZ_X_ORIGPTR_1:
811 s->state = BZ_X_ORIGPTR_1; 811 s->state = BZ_X_ORIGPTR_1;
812 if (get_bits(s, &uc, 8) == FALSE) { 812 if (! get_bits(s, &uc, 8)) {
813 retVal = BZ_OK; 813 retVal = BZ_OK;
814 goto save_state_and_return; 814 goto save_state_and_return;
815 } 815 }
@@ -817,7 +817,7 @@ int BZ2_decompress(DState *s)
817 817
818 case BZ_X_ORIGPTR_2: 818 case BZ_X_ORIGPTR_2:
819 s->state = BZ_X_ORIGPTR_2; 819 s->state = BZ_X_ORIGPTR_2;
820 if (get_bits(s, &uc, 8) == FALSE) { 820 if (! get_bits(s, &uc, 8)) {
821 retVal = BZ_OK; 821 retVal = BZ_OK;
822 goto save_state_and_return; 822 goto save_state_and_return;
823 } 823 }
@@ -825,7 +825,7 @@ int BZ2_decompress(DState *s)
825 825
826 case BZ_X_ORIGPTR_3: 826 case BZ_X_ORIGPTR_3:
827 s->state = BZ_X_ORIGPTR_3; 827 s->state = BZ_X_ORIGPTR_3;
828 if (get_bits(s, &uc, 8) == FALSE) { 828 if (! get_bits(s, &uc, 8)) {
829 retVal = BZ_OK; 829 retVal = BZ_OK;
830 goto save_state_and_return; 830 goto save_state_and_return;
831 } 831 }
@@ -844,7 +844,7 @@ int BZ2_decompress(DState *s)
844 case BZ_X_MAPPING_1: 844 case BZ_X_MAPPING_1:
845 for (i = 0; i < 16; i++) { 845 for (i = 0; i < 16; i++) {
846 s->state = BZ_X_MAPPING_1; 846 s->state = BZ_X_MAPPING_1;
847 if (get_bits(s, &uc, 1) == FALSE) { 847 if (! get_bits(s, &uc, 1)) {
848 retVal = BZ_OK; 848 retVal = BZ_OK;
849 goto save_state_and_return; 849 goto save_state_and_return;
850 } 850 }
@@ -864,7 +864,7 @@ int BZ2_decompress(DState *s)
864 for (j = 0; j < 16; j++) { 864 for (j = 0; j < 16; j++) {
865 case BZ_X_MAPPING_2: 865 case BZ_X_MAPPING_2:
866 s->state = BZ_X_MAPPING_2; 866 s->state = BZ_X_MAPPING_2;
867 if (get_bits(s, &uc, 1) == FALSE) { 867 if (! get_bits(s, &uc, 1)) {
868 retVal = BZ_OK; 868 retVal = BZ_OK;
869 goto save_state_and_return; 869 goto save_state_and_return;
870 } 870 }
@@ -891,7 +891,7 @@ int BZ2_decompress(DState *s)
891 /*--- Now the selectors ---*/ 891 /*--- Now the selectors ---*/
892 case BZ_X_SELECTOR_1: 892 case BZ_X_SELECTOR_1:
893 s->state = BZ_X_SELECTOR_1; 893 s->state = BZ_X_SELECTOR_1;
894 if (get_bits(s, &nGroups, 3) == FALSE) { 894 if (! get_bits(s, &nGroups, 3)) {
895 retVal = BZ_OK; 895 retVal = BZ_OK;
896 goto save_state_and_return; 896 goto save_state_and_return;
897 } 897 }
@@ -902,7 +902,7 @@ int BZ2_decompress(DState *s)
902 902
903 case BZ_X_SELECTOR_2: 903 case BZ_X_SELECTOR_2:
904 s->state = BZ_X_SELECTOR_2; 904 s->state = BZ_X_SELECTOR_2;
905 if (get_bits(s, &nSelectors, 15) == FALSE) { 905 if (! get_bits(s, &nSelectors, 15)) {
906 retVal = BZ_OK; 906 retVal = BZ_OK;
907 goto save_state_and_return; 907 goto save_state_and_return;
908 } 908 }
@@ -918,7 +918,7 @@ int BZ2_decompress(DState *s)
918 while (1) { 918 while (1) {
919 case BZ_X_SELECTOR_3: 919 case BZ_X_SELECTOR_3:
920 s->state = BZ_X_SELECTOR_3; 920 s->state = BZ_X_SELECTOR_3;
921 if (get_bits(s, &uc, 1) == FALSE) { 921 if (! get_bits(s, &uc, 1)) {
922 retVal = BZ_OK; 922 retVal = BZ_OK;
923 goto save_state_and_return; 923 goto save_state_and_return;
924 } 924 }
@@ -956,7 +956,7 @@ int BZ2_decompress(DState *s)
956 for (t = 0; t < nGroups; t++) { 956 for (t = 0; t < nGroups; t++) {
957 case BZ_X_CODING_1: 957 case BZ_X_CODING_1:
958 s->state = BZ_X_CODING_1; 958 s->state = BZ_X_CODING_1;
959 if (get_bits(s, &curr, 5) == FALSE) { 959 if (! get_bits(s, &curr, 5)) {
960 retVal = BZ_OK; 960 retVal = BZ_OK;
961 goto save_state_and_return; 961 goto save_state_and_return;
962 } 962 }
@@ -969,7 +969,7 @@ int BZ2_decompress(DState *s)
969 969
970 case BZ_X_CODING_2: 970 case BZ_X_CODING_2:
971 s->state = BZ_X_CODING_2; 971 s->state = BZ_X_CODING_2;
972 if (get_bits(s, &uc, 1) == FALSE) { 972 if (! get_bits(s, &uc, 1)) {
973 retVal = BZ_OK; 973 retVal = BZ_OK;
974 goto save_state_and_return; 974 goto save_state_and_return;
975 } 975 }
@@ -979,7 +979,7 @@ int BZ2_decompress(DState *s)
979 979
980 case BZ_X_CODING_3: 980 case BZ_X_CODING_3:
981 s->state = BZ_X_CODING_3; 981 s->state = BZ_X_CODING_3;
982 if (get_bits(s, &uc, 1) == FALSE) { 982 if (! get_bits(s, &uc, 1)) {
983 retVal = BZ_OK; 983 retVal = BZ_OK;
984 goto save_state_and_return; 984 goto save_state_and_return;
985 } 985 }
@@ -1044,12 +1044,12 @@ int BZ2_decompress(DState *s)
1044 1044
1045 nblock = 0; 1045 nblock = 0;
1046 1046
1047 if (get_mtf_val_init() == FALSE) { 1047 if (! get_mtf_val_init()) {
1048 goto save_state_and_return; 1048 goto save_state_and_return;
1049 } 1049 }
1050 case BZ_X_MTF_1: 1050 case BZ_X_MTF_1:
1051 s->state = BZ_X_MTF_1; 1051 s->state = BZ_X_MTF_1;
1052 if (get_bits(s, &zvec, zn) == FALSE) { 1052 if (! get_bits(s, &zvec, zn)) {
1053 retVal = BZ_OK; 1053 retVal = BZ_OK;
1054 goto save_state_and_return; 1054 goto save_state_and_return;
1055 } 1055 }
@@ -1065,7 +1065,7 @@ int BZ2_decompress(DState *s)
1065 1065
1066 case BZ_X_MTF_2: 1066 case BZ_X_MTF_2:
1067 s->state = BZ_X_MTF_2; 1067 s->state = BZ_X_MTF_2;
1068 if (get_bits(s, &zj, 1) == FALSE) { 1068 if (! get_bits(s, &zj, 1)) {
1069 retVal = BZ_OK; 1069 retVal = BZ_OK;
1070 goto save_state_and_return; 1070 goto save_state_and_return;
1071 } 1071 }
@@ -1094,12 +1094,12 @@ int BZ2_decompress(DState *s)
1094 } 1094 }
1095 } 1095 }
1096 N = N * 2; 1096 N = N * 2;
1097 if (get_mtf_val_init() == FALSE) { 1097 if (! get_mtf_val_init()) {
1098 goto save_state_and_return; 1098 goto save_state_and_return;
1099 } 1099 }
1100 case BZ_X_MTF_3: 1100 case BZ_X_MTF_3:
1101 s->state = BZ_X_MTF_3; 1101 s->state = BZ_X_MTF_3;
1102 if (get_bits(s, &zvec, zn) == FALSE) { 1102 if (! get_bits(s, &zvec, zn)) {
1103 retVal = BZ_OK; 1103 retVal = BZ_OK;
1104 goto save_state_and_return; 1104 goto save_state_and_return;
1105 } 1105 }
@@ -1115,7 +1115,7 @@ int BZ2_decompress(DState *s)
1115 1115
1116 case BZ_X_MTF_4: 1116 case BZ_X_MTF_4:
1117 s->state = BZ_X_MTF_4; 1117 s->state = BZ_X_MTF_4;
1118 if (get_bits(s, &zj, 1) == FALSE) { 1118 if (! get_bits(s, &zj, 1)) {
1119 retVal = BZ_OK; 1119 retVal = BZ_OK;
1120 goto save_state_and_return; 1120 goto save_state_and_return;
1121 } 1121 }
@@ -1223,12 +1223,12 @@ int BZ2_decompress(DState *s)
1223 } 1223 }
1224 nblock++; 1224 nblock++;
1225 1225
1226 if (get_mtf_val_init() == FALSE) { 1226 if (! get_mtf_val_init()) {
1227 goto save_state_and_return; 1227 goto save_state_and_return;
1228 } 1228 }
1229 case BZ_X_MTF_5: 1229 case BZ_X_MTF_5:
1230 s->state = BZ_X_MTF_5; 1230 s->state = BZ_X_MTF_5;
1231 if (get_bits(s, &zvec, zn) == FALSE) { 1231 if (! get_bits(s, &zvec, zn)) {
1232 retVal = BZ_OK; 1232 retVal = BZ_OK;
1233 goto save_state_and_return; 1233 goto save_state_and_return;
1234 } 1234 }
@@ -1244,7 +1244,7 @@ int BZ2_decompress(DState *s)
1244 1244
1245 case BZ_X_MTF_6: 1245 case BZ_X_MTF_6:
1246 s->state = BZ_X_MTF_6; 1246 s->state = BZ_X_MTF_6;
1247 if (get_bits(s, &zj, 1) == FALSE) { 1247 if (! get_bits(s, &zj, 1)) {
1248 retVal = BZ_OK; 1248 retVal = BZ_OK;
1249 goto save_state_and_return; 1249 goto save_state_and_return;
1250 } 1250 }
@@ -1366,7 +1366,7 @@ int BZ2_decompress(DState *s)
1366endhdr_2: 1366endhdr_2:
1367 case BZ_X_ENDHDR_2: 1367 case BZ_X_ENDHDR_2:
1368 s->state = BZ_X_ENDHDR_2; 1368 s->state = BZ_X_ENDHDR_2;
1369 if (get_bits(s, &uc, 8) == FALSE) { 1369 if (! get_bits(s, &uc, 8)) {
1370 retVal = BZ_OK; 1370 retVal = BZ_OK;
1371 goto save_state_and_return; 1371 goto save_state_and_return;
1372 } 1372 }
@@ -1377,7 +1377,7 @@ endhdr_2:
1377 1377
1378 case BZ_X_ENDHDR_3: 1378 case BZ_X_ENDHDR_3:
1379 s->state = BZ_X_ENDHDR_3; 1379 s->state = BZ_X_ENDHDR_3;
1380 if (get_bits(s, &uc, 8) == FALSE) { 1380 if (! get_bits(s, &uc, 8)) {
1381 retVal = BZ_OK; 1381 retVal = BZ_OK;
1382 goto save_state_and_return; 1382 goto save_state_and_return;
1383 } 1383 }
@@ -1388,7 +1388,7 @@ endhdr_2:
1388 1388
1389 case BZ_X_ENDHDR_4: 1389 case BZ_X_ENDHDR_4:
1390 s->state = BZ_X_ENDHDR_4; 1390 s->state = BZ_X_ENDHDR_4;
1391 if (get_bits(s, &uc, 8) == FALSE) { 1391 if (! get_bits(s, &uc, 8)) {
1392 retVal = BZ_OK; 1392 retVal = BZ_OK;
1393 goto save_state_and_return; 1393 goto save_state_and_return;
1394 } 1394 }
@@ -1399,7 +1399,7 @@ endhdr_2:
1399 1399
1400 case BZ_X_ENDHDR_5: 1400 case BZ_X_ENDHDR_5:
1401 s->state = BZ_X_ENDHDR_5; 1401 s->state = BZ_X_ENDHDR_5;
1402 if (get_bits(s, &uc, 8) == FALSE) { 1402 if (! get_bits(s, &uc, 8)) {
1403 retVal = BZ_OK; 1403 retVal = BZ_OK;
1404 goto save_state_and_return; 1404 goto save_state_and_return;
1405 } 1405 }
@@ -1410,7 +1410,7 @@ endhdr_2:
1410 1410
1411 case BZ_X_ENDHDR_6: 1411 case BZ_X_ENDHDR_6:
1412 s->state = BZ_X_ENDHDR_6; 1412 s->state = BZ_X_ENDHDR_6;
1413 if (get_bits(s, &uc, 8) == FALSE) { 1413 if (! get_bits(s, &uc, 8)) {
1414 retVal = BZ_OK; 1414 retVal = BZ_OK;
1415 goto save_state_and_return; 1415 goto save_state_and_return;
1416 } 1416 }
@@ -1422,14 +1422,14 @@ endhdr_2:
1422 1422
1423 case BZ_X_CCRC_1: 1423 case BZ_X_CCRC_1:
1424 s->state = BZ_X_CCRC_1; 1424 s->state = BZ_X_CCRC_1;
1425 if (get_bits(s, &uc, 8) == FALSE) { 1425 if (! get_bits(s, &uc, 8)) {
1426 retVal = BZ_OK; 1426 retVal = BZ_OK;
1427 goto save_state_and_return; 1427 goto save_state_and_return;
1428 } 1428 }
1429 s->storedCombinedCRC = (s->storedCombinedCRC << 8) | ((unsigned int)uc); 1429 s->storedCombinedCRC = (s->storedCombinedCRC << 8) | ((unsigned int)uc);
1430 case BZ_X_CCRC_2: 1430 case BZ_X_CCRC_2:
1431 s->state = BZ_X_CCRC_2; 1431 s->state = BZ_X_CCRC_2;
1432 if (get_bits(s, &uc, 8) == FALSE) { 1432 if (! get_bits(s, &uc, 8)) {
1433 retVal = BZ_OK; 1433 retVal = BZ_OK;
1434 goto save_state_and_return; 1434 goto save_state_and_return;
1435 } 1435 }
@@ -1437,7 +1437,7 @@ endhdr_2:
1437 1437
1438 case BZ_X_CCRC_3: 1438 case BZ_X_CCRC_3:
1439 s->state = BZ_X_CCRC_3; 1439 s->state = BZ_X_CCRC_3;
1440 if (get_bits(s, &uc, 8) == FALSE) { 1440 if (! get_bits(s, &uc, 8)) {
1441 retVal = BZ_OK; 1441 retVal = BZ_OK;
1442 goto save_state_and_return; 1442 goto save_state_and_return;
1443 } 1443 }
@@ -1445,7 +1445,7 @@ endhdr_2:
1445 1445
1446 case BZ_X_CCRC_4: 1446 case BZ_X_CCRC_4:
1447 s->state = BZ_X_CCRC_4; 1447 s->state = BZ_X_CCRC_4;
1448 if (get_bits(s, &uc, 8) == FALSE) { 1448 if (! get_bits(s, &uc, 8)) {
1449 retVal = BZ_OK; 1449 retVal = BZ_OK;
1450 goto save_state_and_return; 1450 goto save_state_and_return;
1451 } 1451 }
diff --git a/archival/dpkg.c b/archival/dpkg.c
index 0ccca8f95..f41363d0f 100644
--- a/archival/dpkg.c
+++ b/archival/dpkg.c
@@ -858,7 +858,7 @@ void write_status_file(deb_file_t **deb_file)
858 } 858 }
859 } 859 }
860 /* If the package from the status file wasnt handle above, do it now*/ 860 /* If the package from the status file wasnt handle above, do it now*/
861 if (write_flag == FALSE) { 861 if (! write_flag) {
862 fprintf(new_status_file, "%s\n\n", control_buffer); 862 fprintf(new_status_file, "%s\n\n", control_buffer);
863 } 863 }
864 864
@@ -1206,7 +1206,7 @@ void remove_package(const unsigned int package_num)
1206 exclude_files = create_list(conffile_name); 1206 exclude_files = create_list(conffile_name);
1207 1207
1208 /* Some directories cant be removed straight away, so do multiple passes */ 1208 /* Some directories cant be removed straight away, so do multiple passes */
1209 while (remove_file_array(remove_files, exclude_files) == TRUE); 1209 while (remove_file_array(remove_files, exclude_files));
1210 1210
1211 /* Create a list of all /var/lib/dpkg/info/<package> files */ 1211 /* Create a list of all /var/lib/dpkg/info/<package> files */
1212 remove_files = xmalloc(sizeof(char *) * 11); 1212 remove_files = xmalloc(sizeof(char *) * 11);
@@ -1250,7 +1250,7 @@ void purge_package(const unsigned int package_num)
1250 exclude_files[0] = NULL; 1250 exclude_files[0] = NULL;
1251 1251
1252 /* Some directories cant be removed straight away, so do multiple passes */ 1252 /* Some directories cant be removed straight away, so do multiple passes */
1253 while (remove_file_array(remove_files, exclude_files) == TRUE); 1253 while (remove_file_array(remove_files, exclude_files));
1254 1254
1255 /* Create a list of all /var/lib/dpkg/info/<package> files */ 1255 /* Create a list of all /var/lib/dpkg/info/<package> files */
1256 remove_files = xmalloc(sizeof(char *) * 11); 1256 remove_files = xmalloc(sizeof(char *) * 11);
diff --git a/archival/gunzip.c b/archival/gunzip.c
index 388672541..5fdb0917a 100644
--- a/archival/gunzip.c
+++ b/archival/gunzip.c
@@ -171,7 +171,7 @@ extern int gunzip_main(int argc, char **argv)
171 fclose(out_file); 171 fclose(out_file);
172 fclose(in_file); 172 fclose(in_file);
173 173
174 if (delete_old_file == TRUE) { 174 if (delete_old_file) {
175 if (unlink(delete_file_name) < 0) { 175 if (unlink(delete_file_name) < 0) {
176 error_msg_and_die("Couldnt remove %s", delete_file_name); 176 error_msg_and_die("Couldnt remove %s", delete_file_name);
177 } 177 }
diff --git a/archival/libunarchive/unarchive.c b/archival/libunarchive/unarchive.c
index 4a42eaf7d..ff9b5876f 100644
--- a/archival/libunarchive/unarchive.c
+++ b/archival/libunarchive/unarchive.c
@@ -227,7 +227,7 @@ char *unarchive(FILE *src_stream, FILE *out_stream, file_header_t *(*get_headers
227 } 227 }
228 } 228 }
229 229
230 if (extract_flag == TRUE) { 230 if (extract_flag) {
231 buffer = extract_archive(src_stream, out_stream, file_entry, extract_function, prefix); 231 buffer = extract_archive(src_stream, out_stream, file_entry, extract_function, prefix);
232 } else { 232 } else {
233 /* seek past the data entry */ 233 /* seek past the data entry */
@@ -238,4 +238,4 @@ char *unarchive(FILE *src_stream, FILE *out_stream, file_header_t *(*get_headers
238 free(file_entry); 238 free(file_entry);
239 } 239 }
240 return(buffer); 240 return(buffer);
241} \ No newline at end of file 241}
diff --git a/archival/tar.c b/archival/tar.c
index dd65de131..22cbf3ab2 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -476,9 +476,9 @@ static int writeTarFile(const char* tarName, int verboseFlag, char **argv,
476 476
477 /* Read the directory/files and iterate over them one at a time */ 477 /* Read the directory/files and iterate over them one at a time */
478 while (*argv != NULL) { 478 while (*argv != NULL) {
479 if (recursive_action(*argv++, TRUE, FALSE, FALSE, 479 if (! recursive_action(*argv++, TRUE, FALSE, FALSE,
480 writeFileToTarball, writeFileToTarball, 480 writeFileToTarball, writeFileToTarball,
481 (void*) &tbInfo) == FALSE) { 481 (void*) &tbInfo)) {
482 errorFlag = TRUE; 482 errorFlag = TRUE;
483 } 483 }
484 } 484 }
@@ -494,7 +494,7 @@ static int writeTarFile(const char* tarName, int verboseFlag, char **argv,
494 494
495 /* Hang up the tools, close up shop, head home */ 495 /* Hang up the tools, close up shop, head home */
496 close(tarFd); 496 close(tarFd);
497 if (errorFlag == TRUE) { 497 if (errorFlag) {
498 error_msg("Error exit delayed from previous errors"); 498 error_msg("Error exit delayed from previous errors");
499 freeHardLinkInfo(&tbInfo.hlInfoHead); 499 freeHardLinkInfo(&tbInfo.hlInfoHead);
500 return(FALSE); 500 return(FALSE);
@@ -556,7 +556,7 @@ char **list_and_not_list(char **include_list, char **exclude_list)
556 exclude_count++; 556 exclude_count++;
557 } 557 }
558 558
559 if (found == FALSE) { 559 if (! found) {
560 new_include_list = realloc(new_include_list, sizeof(char *) * (include_count + 2)); 560 new_include_list = realloc(new_include_list, sizeof(char *) * (include_count + 2));
561 new_include_list[new_include_count] = include_list[include_count]; 561 new_include_list[new_include_count] = include_list[include_count];
562 new_include_count++; 562 new_include_count++;
diff --git a/coreutils/cat.c b/coreutils/cat.c
index 820b6342e..33f15da71 100644
--- a/coreutils/cat.c
+++ b/coreutils/cat.c
@@ -37,7 +37,7 @@ extern int cat_main(int argc, char **argv)
37 while (--argc > 0) { 37 while (--argc > 0) {
38 if(!(strcmp(*++argv, "-"))) { 38 if(!(strcmp(*++argv, "-"))) {
39 print_file(stdin); 39 print_file(stdin);
40 } else if (print_file_by_name(*argv) == FALSE) { 40 } else if (! print_file_by_name(*argv)) {
41 status = EXIT_FAILURE; 41 status = EXIT_FAILURE;
42 } 42 }
43 } 43 }
diff --git a/coreutils/chgrp.c b/coreutils/chgrp.c
index 43ffeb7e6..968b448c0 100644
--- a/coreutils/chgrp.c
+++ b/coreutils/chgrp.c
@@ -72,8 +72,8 @@ int chgrp_main(int argc, char **argv)
72 72
73 /* Ok, ready to do the deed now */ 73 /* Ok, ready to do the deed now */
74 while (++optind < argc) { 74 while (++optind < argc) {
75 if (recursive_action (argv[optind], recursiveFlag, FALSE, FALSE, 75 if (! recursive_action (argv[optind], recursiveFlag, FALSE, FALSE,
76 fileAction, fileAction, NULL) == FALSE) { 76 fileAction, fileAction, NULL)) {
77 return EXIT_FAILURE; 77 return EXIT_FAILURE;
78 } 78 }
79 } 79 }
diff --git a/coreutils/chmod.c b/coreutils/chmod.c
index 53230b568..38b39680f 100644
--- a/coreutils/chmod.c
+++ b/coreutils/chmod.c
@@ -58,7 +58,7 @@ int chmod_main(int argc, char **argv)
58 if (argc > optind && argc > 2 && argv[optind]) { 58 if (argc > optind && argc > 2 && argv[optind]) {
59 /* Parse the specified mode */ 59 /* Parse the specified mode */
60 mode_t mode; 60 mode_t mode;
61 if (parse_mode(argv[optind], &mode) == FALSE) { 61 if (! parse_mode(argv[optind], &mode)) {
62 error_msg_and_die( "unknown mode: %s", argv[optind]); 62 error_msg_and_die( "unknown mode: %s", argv[optind]);
63 } 63 }
64 } else { 64 } else {
@@ -67,8 +67,8 @@ int chmod_main(int argc, char **argv)
67 67
68 /* Ok, ready to do the deed now */ 68 /* Ok, ready to do the deed now */
69 for (i = optind + 1; i < argc; i++) { 69 for (i = optind + 1; i < argc; i++) {
70 if (recursive_action (argv[i], recursiveFlag, FALSE, FALSE, fileAction, 70 if (! recursive_action (argv[i], recursiveFlag, FALSE, FALSE, fileAction,
71 fileAction, argv[optind]) == FALSE) { 71 fileAction, argv[optind])) {
72 return EXIT_FAILURE; 72 return EXIT_FAILURE;
73 } 73 }
74 } 74 }
diff --git a/coreutils/chown.c b/coreutils/chown.c
index c1b992c37..846e27c20 100644
--- a/coreutils/chown.c
+++ b/coreutils/chown.c
@@ -94,8 +94,8 @@ int chown_main(int argc, char **argv)
94 94
95 /* Ok, ready to do the deed now */ 95 /* Ok, ready to do the deed now */
96 while (++optind < argc) { 96 while (++optind < argc) {
97 if (recursive_action (argv[optind], recursiveFlag, FALSE, FALSE, 97 if (! recursive_action (argv[optind], recursiveFlag, FALSE, FALSE,
98 fileAction, fileAction, NULL) == FALSE) { 98 fileAction, fileAction, NULL)) {
99 return EXIT_FAILURE; 99 return EXIT_FAILURE;
100 } 100 }
101 } 101 }
diff --git a/coreutils/ls.c b/coreutils/ls.c
index 672a3bb3c..07e083f5a 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -193,7 +193,7 @@ static unsigned long ls_disp_hr = 0;
193static int my_stat(struct dnode *cur) 193static int my_stat(struct dnode *cur)
194{ 194{
195#ifdef CONFIG_FEATURE_LS_FOLLOWLINKS 195#ifdef CONFIG_FEATURE_LS_FOLLOWLINKS
196 if (follow_links == TRUE) { 196 if (follow_links) {
197 if (stat(cur->fullname, &cur->dstat)) { 197 if (stat(cur->fullname, &cur->dstat)) {
198 perror_msg("%s", cur->fullname); 198 perror_msg("%s", cur->fullname);
199 status = EXIT_FAILURE; 199 status = EXIT_FAILURE;
diff --git a/coreutils/touch.c b/coreutils/touch.c
index 3e2e600f3..f1c6dc484 100644
--- a/coreutils/touch.c
+++ b/coreutils/touch.c
@@ -53,10 +53,10 @@ extern int touch_main(int argc, char **argv)
53 } 53 }
54 54
55 while (argc > 0) { 55 while (argc > 0) {
56 fd = open(*argv, (create == FALSE) ? O_RDWR : O_RDWR | O_CREAT, 56 fd = open(*argv, create ? O_RDWR | O_CREAT : O_RDWR,
57 S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH); 57 S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
58 if (fd < 0) { 58 if (fd < 0) {
59 if (create == FALSE && errno == ENOENT) { 59 if (! create && errno == ENOENT) {
60 argc--; 60 argc--;
61 argv++; 61 argv++;
62 continue; 62 continue;
diff --git a/editors/vi.c b/editors/vi.c
index 852e16340..a187c6dd0 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -19,7 +19,7 @@
19 */ 19 */
20 20
21static const char vi_Version[] = 21static const char vi_Version[] =
22 "$Id: vi.c,v 1.19 2001/11/17 07:14:06 andersen Exp $"; 22 "$Id: vi.c,v 1.20 2001/12/20 23:12:47 kraai Exp $";
23 23
24/* 24/*
25 * To compile for standalone use: 25 * To compile for standalone use:
@@ -1219,7 +1219,7 @@ key_cmd_mode:
1219 break; 1219 break;
1220 if (strncasecmp((char *) p, "quit", cnt) == 0 || 1220 if (strncasecmp((char *) p, "quit", cnt) == 0 ||
1221 strncasecmp((char *) p, "q!", cnt) == 0) { // delete lines 1221 strncasecmp((char *) p, "q!", cnt) == 0) { // delete lines
1222 if (file_modified == TRUE && p[1] != '!') { 1222 if (file_modified && p[1] != '!') {
1223 psbs("No write since last change (:quit! overrides)"); 1223 psbs("No write since last change (:quit! overrides)");
1224 } else { 1224 } else {
1225 editing = 0; 1225 editing = 0;
@@ -1410,10 +1410,10 @@ key_cmd_mode:
1410 indicate_error(c); 1410 indicate_error(c);
1411 break; 1411 break;
1412 } 1412 }
1413 if (file_modified == TRUE 1413 if (file_modified
1414#ifdef CONFIG_FEATURE_VI_READONLY 1414#ifdef CONFIG_FEATURE_VI_READONLY
1415 && vi_readonly == FALSE 1415 && ! vi_readonly
1416 && readonly == FALSE 1416 && ! readonly
1417#endif /* CONFIG_FEATURE_VI_READONLY */ 1417#endif /* CONFIG_FEATURE_VI_READONLY */
1418 ) { 1418 ) {
1419 cnt = file_write(cfn, text, end - 1); 1419 cnt = file_write(cfn, text, end - 1);
@@ -1829,7 +1829,7 @@ static void colon(Byte * buf)
1829 int sr; 1829 int sr;
1830 sr= 0; 1830 sr= 0;
1831 // don't edit, if the current file has been modified 1831 // don't edit, if the current file has been modified
1832 if (file_modified == TRUE && useforce != TRUE) { 1832 if (file_modified && ! useforce) {
1833 psbs("No write since last change (:edit! overrides)"); 1833 psbs("No write since last change (:edit! overrides)");
1834 goto vc1; 1834 goto vc1;
1835 } 1835 }
@@ -1908,7 +1908,7 @@ static void colon(Byte * buf)
1908 " %dL, %dC", cfn, 1908 " %dL, %dC", cfn,
1909 (sr < 0 ? " [New file]" : ""), 1909 (sr < 0 ? " [New file]" : ""),
1910#ifdef CONFIG_FEATURE_VI_READONLY 1910#ifdef CONFIG_FEATURE_VI_READONLY
1911 ((vi_readonly == TRUE || readonly == TRUE) ? " [Read only]" : ""), 1911 ((vi_readonly || readonly) ? " [Read only]" : ""),
1912#endif /* CONFIG_FEATURE_VI_READONLY */ 1912#endif /* CONFIG_FEATURE_VI_READONLY */
1913 li, ch); 1913 li, ch);
1914 } else if (strncasecmp((char *) cmd, "file", i) == 0) { // what File is this 1914 } else if (strncasecmp((char *) cmd, "file", i) == 0) { // what File is this
@@ -1961,7 +1961,7 @@ static void colon(Byte * buf)
1961 Hit_Return(); 1961 Hit_Return();
1962 } else if ((strncasecmp((char *) cmd, "quit", i) == 0) || // Quit 1962 } else if ((strncasecmp((char *) cmd, "quit", i) == 0) || // Quit
1963 (strncasecmp((char *) cmd, "next", i) == 0)) { // edit next file 1963 (strncasecmp((char *) cmd, "next", i) == 0)) { // edit next file
1964 if (useforce == TRUE) { 1964 if (useforce) {
1965 // force end of argv list 1965 // force end of argv list
1966 if (*cmd == 'q') { 1966 if (*cmd == 'q') {
1967 optind = save_argc; 1967 optind = save_argc;
@@ -1970,7 +1970,7 @@ static void colon(Byte * buf)
1970 goto vc1; 1970 goto vc1;
1971 } 1971 }
1972 // don't exit if the file been modified 1972 // don't exit if the file been modified
1973 if (file_modified == TRUE) { 1973 if (file_modified) {
1974 psbs("No write since last change (:%s! overrides)", 1974 psbs("No write since last change (:%s! overrides)",
1975 (*cmd == 'q' ? "quit" : "next")); 1975 (*cmd == 'q' ? "quit" : "next"));
1976 goto vc1; 1976 goto vc1;
@@ -2014,7 +2014,7 @@ static void colon(Byte * buf)
2014#endif /* CONFIG_FEATURE_VI_READONLY */ 2014#endif /* CONFIG_FEATURE_VI_READONLY */
2015 " %dL, %dC", fn, 2015 " %dL, %dC", fn,
2016#ifdef CONFIG_FEATURE_VI_READONLY 2016#ifdef CONFIG_FEATURE_VI_READONLY
2017 ((vi_readonly == TRUE || readonly == TRUE) ? " [Read only]" : ""), 2017 ((vi_readonly || readonly) ? " [Read only]" : ""),
2018#endif /* CONFIG_FEATURE_VI_READONLY */ 2018#endif /* CONFIG_FEATURE_VI_READONLY */
2019 li, ch); 2019 li, ch);
2020 if (ch > 0) { 2020 if (ch > 0) {
@@ -2024,7 +2024,7 @@ static void colon(Byte * buf)
2024 file_modified = TRUE; 2024 file_modified = TRUE;
2025 } 2025 }
2026 } else if (strncasecmp((char *) cmd, "rewind", i) == 0) { // rewind cmd line args 2026 } else if (strncasecmp((char *) cmd, "rewind", i) == 0) { // rewind cmd line args
2027 if (file_modified == TRUE && useforce != TRUE) { 2027 if (file_modified && ! useforce) {
2028 psbs("No write since last change (:rewind! overrides)"); 2028 psbs("No write since last change (:rewind! overrides)");
2029 } else { 2029 } else {
2030 // reset the filenames to edit 2030 // reset the filenames to edit
@@ -2140,7 +2140,7 @@ static void colon(Byte * buf)
2140 fn = args; 2140 fn = args;
2141 } 2141 }
2142#ifdef CONFIG_FEATURE_VI_READONLY 2142#ifdef CONFIG_FEATURE_VI_READONLY
2143 if ((vi_readonly == TRUE || readonly == TRUE) && useforce == FALSE) { 2143 if ((vi_readonly || readonly) && ! useforce) {
2144 psbs("\"%s\" File is read only", fn); 2144 psbs("\"%s\" File is read only", fn);
2145 goto vc3; 2145 goto vc3;
2146 } 2146 }
@@ -2149,14 +2149,14 @@ static void colon(Byte * buf)
2149 li = count_lines(q, r); 2149 li = count_lines(q, r);
2150 ch = r - q + 1; 2150 ch = r - q + 1;
2151 // see if file exists- if not, its just a new file request 2151 // see if file exists- if not, its just a new file request
2152 if (useforce == TRUE) { 2152 if (useforce) {
2153 // if "fn" is not write-able, chmod u+w 2153 // if "fn" is not write-able, chmod u+w
2154 // sprintf(syscmd, "chmod u+w %s", fn); 2154 // sprintf(syscmd, "chmod u+w %s", fn);
2155 // system(syscmd); 2155 // system(syscmd);
2156 forced = TRUE; 2156 forced = TRUE;
2157 } 2157 }
2158 l = file_write(fn, q, r); 2158 l = file_write(fn, q, r);
2159 if (useforce == TRUE && forced == TRUE) { 2159 if (useforce && forced) {
2160 // chmod u-w 2160 // chmod u-w
2161 // sprintf(syscmd, "chmod u-w %s", fn); 2161 // sprintf(syscmd, "chmod u-w %s", fn);
2162 // system(syscmd); 2162 // system(syscmd);
@@ -3527,7 +3527,7 @@ static int file_insert(Byte * fn, Byte * p, int size)
3527 3527
3528 // see if we can open the file 3528 // see if we can open the file
3529#ifdef CONFIG_FEATURE_VI_READONLY 3529#ifdef CONFIG_FEATURE_VI_READONLY
3530 if (vi_readonly == TRUE) goto fi1; // do not try write-mode 3530 if (vi_readonly) goto fi1; // do not try write-mode
3531#endif 3531#endif
3532 fd = open((char *) fn, O_RDWR); // assume read & write 3532 fd = open((char *) fn, O_RDWR); // assume read & write
3533 if (fd < 0) { 3533 if (fd < 0) {
@@ -3623,7 +3623,7 @@ static void place_cursor(int row, int col, int opti)
3623 //----- 1. Try the standard terminal ESC sequence 3623 //----- 1. Try the standard terminal ESC sequence
3624 sprintf((char *) cm1, CMrc, row + 1, col + 1); 3624 sprintf((char *) cm1, CMrc, row + 1, col + 1);
3625 cm= cm1; 3625 cm= cm1;
3626 if (opti == FALSE) goto pc0; 3626 if (! opti) goto pc0;
3627 3627
3628#ifdef CONFIG_FEATURE_VI_OPTIMIZE_CURSOR 3628#ifdef CONFIG_FEATURE_VI_OPTIMIZE_CURSOR
3629 //----- find the minimum # of chars to move cursor ------------- 3629 //----- find the minimum # of chars to move cursor -------------
@@ -3798,9 +3798,9 @@ static void edit_status(void) // show file status on status line
3798 "%s line %d of %d --%d%%--", 3798 "%s line %d of %d --%d%%--",
3799 (cfn != 0 ? (char *) cfn : "No file"), 3799 (cfn != 0 ? (char *) cfn : "No file"),
3800#ifdef CONFIG_FEATURE_VI_READONLY 3800#ifdef CONFIG_FEATURE_VI_READONLY
3801 ((vi_readonly == TRUE || readonly == TRUE) ? " [Read only]" : ""), 3801 ((vi_readonly || readonly) ? " [Read only]" : ""),
3802#endif /* CONFIG_FEATURE_VI_READONLY */ 3802#endif /* CONFIG_FEATURE_VI_READONLY */
3803 (file_modified == TRUE ? " [modified]" : ""), 3803 (file_modified ? " [modified]" : ""),
3804 cur, tot, percent); 3804 cur, tot, percent);
3805} 3805}
3806 3806
@@ -3888,7 +3888,7 @@ static void refresh(int full_screen)
3888 cs= 0; 3888 cs= 0;
3889 ce= columns-1; 3889 ce= columns-1;
3890 sp = &screen[li * columns]; // start of screen line 3890 sp = &screen[li * columns]; // start of screen line
3891 if (full_screen == TRUE) { 3891 if (full_screen) {
3892 // force re-draw of every single column from 0 - columns-1 3892 // force re-draw of every single column from 0 - columns-1
3893 goto re0; 3893 goto re0;
3894 } 3894 }
@@ -3921,7 +3921,7 @@ static void refresh(int full_screen)
3921 if (ce > columns-1) ce= columns-1; 3921 if (ce > columns-1) ce= columns-1;
3922 if (cs > ce) { cs= 0; ce= columns-1; } 3922 if (cs > ce) { cs= 0; ce= columns-1; }
3923 // is there a change between vitual screen and buf 3923 // is there a change between vitual screen and buf
3924 if (changed == TRUE) { 3924 if (changed) {
3925 // copy changed part of buffer to virtual screen 3925 // copy changed part of buffer to virtual screen
3926 memmove(sp+cs, buf+(cs+offset), ce-cs+1); 3926 memmove(sp+cs, buf+(cs+offset), ce-cs+1);
3927 3927
diff --git a/findutils/find.c b/findutils/find.c
index 262213e8b..0ff0893a6 100644
--- a/findutils/find.c
+++ b/findutils/find.c
@@ -185,13 +185,13 @@ int find_main(int argc, char **argv)
185 } 185 }
186 186
187 if (firstopt == 1) { 187 if (firstopt == 1) {
188 if (recursive_action(".", TRUE, dereference, FALSE, fileAction, 188 if (! recursive_action(".", TRUE, dereference, FALSE, fileAction,
189 fileAction, NULL) == FALSE) 189 fileAction, NULL))
190 status = EXIT_FAILURE; 190 status = EXIT_FAILURE;
191 } else { 191 } else {
192 for (i = 1; i < firstopt; i++) { 192 for (i = 1; i < firstopt; i++) {
193 if (recursive_action(argv[i], TRUE, dereference, FALSE, fileAction, 193 if (! recursive_action(argv[i], TRUE, dereference, FALSE, fileAction,
194 fileAction, NULL) == FALSE) 194 fileAction, NULL))
195 status = EXIT_FAILURE; 195 status = EXIT_FAILURE;
196 } 196 }
197 } 197 }
diff --git a/init/init.c b/init/init.c
index f6108f1e8..3bb5de0f7 100644
--- a/init/init.c
+++ b/init/init.c
@@ -547,7 +547,7 @@ static pid_t run(char *command, char *terminal, int get_enter)
547 } 547 }
548 } 548 }
549 549
550 if (get_enter == TRUE) { 550 if (get_enter) {
551 /* 551 /*
552 * Save memory by not exec-ing anything large (like a shell) 552 * Save memory by not exec-ing anything large (like a shell)
553 * before the user wants it. This is critical if swap is not 553 * before the user wants it. This is critical if swap is not
@@ -942,7 +942,7 @@ static void parse_inittab(void)
942 } 942 }
943 a++; 943 a++;
944 } 944 }
945 if (foundIt == TRUE) 945 if (foundIt)
946 continue; 946 continue;
947 else { 947 else {
948 /* Choke on an unknown action */ 948 /* Choke on an unknown action */
diff --git a/libbb/isdirectory.c b/libbb/isdirectory.c
index 3dfe10522..e8ef2df14 100644
--- a/libbb/isdirectory.c
+++ b/libbb/isdirectory.c
@@ -39,7 +39,7 @@ int is_directory(const char *fileName, const int followLinks, struct stat *statB
39 ++didMalloc; 39 ++didMalloc;
40 } 40 }
41 41
42 if (followLinks == TRUE) 42 if (followLinks)
43 status = stat(fileName, statBuf); 43 status = stat(fileName, statBuf);
44 else 44 else
45 status = lstat(fileName, statBuf); 45 status = lstat(fileName, statBuf);
diff --git a/libbb/read_package_field.c b/libbb/read_package_field.c
index ac5f80167..867b198ba 100644
--- a/libbb/read_package_field.c
+++ b/libbb/read_package_field.c
@@ -77,7 +77,7 @@ int read_package_field(const char *package_buffer, char **field_name, char **fie
77 } 77 }
78 break; 78 break;
79 } 79 }
80 if (exit_flag == TRUE) { 80 if (exit_flag) {
81 /* Check that the names are valid */ 81 /* Check that the names are valid */
82 offset_value_end = offset; 82 offset_value_end = offset;
83 name_length = offset_name_end - offset_name_start; 83 name_length = offset_name_end - offset_name_start;
diff --git a/libbb/recursive_action.c b/libbb/recursive_action.c
index e87ab9860..8917f470f 100644
--- a/libbb/recursive_action.c
+++ b/libbb/recursive_action.c
@@ -53,7 +53,7 @@ int recursive_action(const char *fileName,
53 struct stat statbuf; 53 struct stat statbuf;
54 struct dirent *next; 54 struct dirent *next;
55 55
56 if (followLinks == TRUE) 56 if (followLinks)
57 status = stat(fileName, &statbuf); 57 status = stat(fileName, &statbuf);
58 else 58 else
59 status = lstat(fileName, &statbuf); 59 status = lstat(fileName, &statbuf);
@@ -68,14 +68,14 @@ int recursive_action(const char *fileName,
68 return FALSE; 68 return FALSE;
69 } 69 }
70 70
71 if ((followLinks == FALSE) && (S_ISLNK(statbuf.st_mode))) { 71 if (! followLinks && (S_ISLNK(statbuf.st_mode))) {
72 if (fileAction == NULL) 72 if (fileAction == NULL)
73 return TRUE; 73 return TRUE;
74 else 74 else
75 return fileAction(fileName, &statbuf, userData); 75 return fileAction(fileName, &statbuf, userData);
76 } 76 }
77 77
78 if (recurse == FALSE) { 78 if (! recurse) {
79 if (S_ISDIR(statbuf.st_mode)) { 79 if (S_ISDIR(statbuf.st_mode)) {
80 if (dirAction != NULL) 80 if (dirAction != NULL)
81 return (dirAction(fileName, &statbuf, userData)); 81 return (dirAction(fileName, &statbuf, userData));
@@ -87,9 +87,9 @@ int recursive_action(const char *fileName,
87 if (S_ISDIR(statbuf.st_mode)) { 87 if (S_ISDIR(statbuf.st_mode)) {
88 DIR *dir; 88 DIR *dir;
89 89
90 if (dirAction != NULL && depthFirst == FALSE) { 90 if (dirAction != NULL && ! depthFirst) {
91 status = dirAction(fileName, &statbuf, userData); 91 status = dirAction(fileName, &statbuf, userData);
92 if (status == FALSE) { 92 if (! status) {
93 perror_msg("%s", fileName); 93 perror_msg("%s", fileName);
94 return FALSE; 94 return FALSE;
95 } else if (status == SKIP) 95 } else if (status == SKIP)
@@ -109,20 +109,20 @@ int recursive_action(const char *fileName,
109 continue; 109 continue;
110 } 110 }
111 nextFile = concat_path_file(fileName, next->d_name); 111 nextFile = concat_path_file(fileName, next->d_name);
112 if (recursive_action(nextFile, TRUE, followLinks, depthFirst, 112 if (! recursive_action(nextFile, TRUE, followLinks, depthFirst,
113 fileAction, dirAction, userData) == FALSE) { 113 fileAction, dirAction, userData)) {
114 status = FALSE; 114 status = FALSE;
115 } 115 }
116 free(nextFile); 116 free(nextFile);
117 } 117 }
118 closedir(dir); 118 closedir(dir);
119 if (dirAction != NULL && depthFirst == TRUE) { 119 if (dirAction != NULL && depthFirst) {
120 if (dirAction(fileName, &statbuf, userData) == FALSE) { 120 if (! dirAction(fileName, &statbuf, userData)) {
121 perror_msg("%s", fileName); 121 perror_msg("%s", fileName);
122 return FALSE; 122 return FALSE;
123 } 123 }
124 } 124 }
125 if (status == FALSE) 125 if (! status)
126 return FALSE; 126 return FALSE;
127 } else { 127 } else {
128 if (fileAction == NULL) 128 if (fileAction == NULL)
diff --git a/modutils/insmod.c b/modutils/insmod.c
index a0bc65121..63500cc8f 100644
--- a/modutils/insmod.c
+++ b/modutils/insmod.c
@@ -133,7 +133,7 @@
133#ifndef MODUTILS_MODULE_H 133#ifndef MODUTILS_MODULE_H
134static const int MODUTILS_MODULE_H = 1; 134static const int MODUTILS_MODULE_H = 1;
135 135
136#ident "$Id: insmod.c,v 1.76 2001/12/14 16:08:17 kraai Exp $" 136#ident "$Id: insmod.c,v 1.77 2001/12/20 23:13:08 kraai Exp $"
137 137
138/* This file contains the structures used by the 2.0 and 2.1 kernels. 138/* This file contains the structures used by the 2.0 and 2.1 kernels.
139 We do not use the kernel headers directly because we do not wish 139 We do not use the kernel headers directly because we do not wish
@@ -350,7 +350,7 @@ int delete_module(const char *);
350#ifndef MODUTILS_OBJ_H 350#ifndef MODUTILS_OBJ_H
351static const int MODUTILS_OBJ_H = 1; 351static const int MODUTILS_OBJ_H = 1;
352 352
353#ident "$Id: insmod.c,v 1.76 2001/12/14 16:08:17 kraai Exp $" 353#ident "$Id: insmod.c,v 1.77 2001/12/20 23:13:08 kraai Exp $"
354 354
355/* The relocatable object is manipulated using elfin types. */ 355/* The relocatable object is manipulated using elfin types. */
356 356
@@ -3314,8 +3314,8 @@ extern int insmod_main( int argc, char **argv)
3314 strcpy(module_dir, _PATH_MODULES); 3314 strcpy(module_dir, _PATH_MODULES);
3315 /* No module found under /lib/modules/`uname -r`, this 3315 /* No module found under /lib/modules/`uname -r`, this
3316 * time cast the net a bit wider. Search /lib/modules/ */ 3316 * time cast the net a bit wider. Search /lib/modules/ */
3317 if (recursive_action(module_dir, TRUE, FALSE, FALSE, 3317 if (! recursive_action(module_dir, TRUE, FALSE, FALSE,
3318 check_module_name_match, 0, m_fullName) == FALSE) 3318 check_module_name_match, 0, m_fullName))
3319 { 3319 {
3320 if (m_filename[0] == '\0' 3320 if (m_filename[0] == '\0'
3321 || ((fp = fopen(m_filename, "r")) == NULL)) 3321 || ((fp = fopen(m_filename, "r")) == NULL))
diff --git a/networking/telnet.c b/networking/telnet.c
index 71479fce4..d09a9d558 100644
--- a/networking/telnet.c
+++ b/networking/telnet.c
@@ -278,7 +278,7 @@ static void handlenetinput(int len)
278 break; 278 break;
279 case TS_SUB1: /* Subnegotiation */ 279 case TS_SUB1: /* Subnegotiation */
280 case TS_SUB2: /* Subnegotiation */ 280 case TS_SUB2: /* Subnegotiation */
281 if (subneg(c) == TRUE) 281 if (subneg(c))
282 G.telstate = TS_0; 282 G.telstate = TS_0;
283 break; 283 break;
284 } 284 }
diff --git a/procps/kill.c b/procps/kill.c
index 7147b5727..c1e8ca2e5 100644
--- a/procps/kill.c
+++ b/procps/kill.c
@@ -133,7 +133,7 @@ extern int kill_main(int argc, char **argv)
133 * upon exit, so we can save a byte or two */ 133 * upon exit, so we can save a byte or two */
134 argv++; 134 argv++;
135 } 135 }
136 if (all_found == FALSE) 136 if (! all_found)
137 return EXIT_FAILURE; 137 return EXIT_FAILURE;
138 } 138 }
139#endif 139#endif
diff --git a/shell/ash.c b/shell/ash.c
index 16c5ec0f2..177ec1c26 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -8172,7 +8172,7 @@ umaskcmd(int argc, char **argv)
8172 umask(mask); 8172 umask(mask);
8173 } else { 8173 } else {
8174 mask = ~mask & 0777; 8174 mask = ~mask & 0777;
8175 if (parse_mode(ap, &mask) == FALSE) { 8175 if (! parse_mode(ap, &mask)) {
8176 error("Illegal mode: %s", ap); 8176 error("Illegal mode: %s", ap);
8177 } 8177 }
8178 umask(~mask & 0777); 8178 umask(~mask & 0777);
@@ -12481,7 +12481,7 @@ findvar(struct var **vpp, const char *name)
12481/* 12481/*
12482 * Copyright (c) 1999 Herbert Xu <herbert@debian.org> 12482 * Copyright (c) 1999 Herbert Xu <herbert@debian.org>
12483 * This file contains code for the times builtin. 12483 * This file contains code for the times builtin.
12484 * $Id: ash.c,v 1.37 2001/12/06 03:37:38 aaronl Exp $ 12484 * $Id: ash.c,v 1.38 2001/12/20 23:13:19 kraai Exp $
12485 */ 12485 */
12486static int timescmd (int argc, char **argv) 12486static int timescmd (int argc, char **argv)
12487{ 12487{
diff --git a/shell/cmdedit.c b/shell/cmdedit.c
index d57e4c12b..b90891587 100644
--- a/shell/cmdedit.c
+++ b/shell/cmdedit.c
@@ -769,7 +769,7 @@ static char **exe_n_cwd_tab_completion(char *command, int *num_matches,
769 goto cont; 769 goto cont;
770 str_found = add_quote_for_spec_chars(found); 770 str_found = add_quote_for_spec_chars(found);
771 if (type == FIND_FILE_ONLY || 771 if (type == FIND_FILE_ONLY ||
772 (type == FIND_EXE_ONLY && is_execute(&st) == TRUE)) 772 (type == FIND_EXE_ONLY && is_execute(&st)))
773 strcat(str_found, " "); 773 strcat(str_found, " ");
774 } 774 }
775 /* Add it to the list */ 775 /* Add it to the list */
@@ -980,7 +980,7 @@ static void input_tab(int *lastWasTab)
980 } 980 }
981 return; 981 return;
982 } 982 }
983 if (*lastWasTab == FALSE) { 983 if (! *lastWasTab) {
984 984
985 char *tmp; 985 char *tmp;
986 int len_found; 986 int len_found;
diff --git a/shell/lash.c b/shell/lash.c
index 4155f8dd2..53377d4ed 100644
--- a/shell/lash.c
+++ b/shell/lash.c
@@ -1437,7 +1437,7 @@ static int busy_loop(FILE * input)
1437 next_command = command; 1437 next_command = command;
1438 } 1438 }
1439 1439
1440 if (expand_arguments(next_command) == FALSE) { 1440 if (! expand_arguments(next_command)) {
1441 free(command); 1441 free(command);
1442 command = (char *) xcalloc(BUFSIZ, sizeof(char)); 1442 command = (char *) xcalloc(BUFSIZ, sizeof(char));
1443 next_command = NULL; 1443 next_command = NULL;
diff --git a/sysklogd/klogd.c b/sysklogd/klogd.c
index 52a815d56..5eb13578b 100644
--- a/sysklogd/klogd.c
+++ b/sysklogd/klogd.c
@@ -135,7 +135,7 @@ extern int klogd_main(int argc, char **argv)
135 } 135 }
136 } 136 }
137 137
138 if (doFork == TRUE) { 138 if (doFork) {
139#if !defined(__UCLIBC__) || defined(__UCLIBC_HAS_MMU__) 139#if !defined(__UCLIBC__) || defined(__UCLIBC_HAS_MMU__)
140 if (daemon(0, 1) < 0) 140 if (daemon(0, 1) < 0)
141 perror_msg_and_die("daemon"); 141 perror_msg_and_die("daemon");
diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c
index 625f99715..6db017cd4 100644
--- a/sysklogd/syslogd.c
+++ b/sysklogd/syslogd.c
@@ -276,7 +276,7 @@ static void message (char *fmt, ...)
276 fl.l_len = 1; 276 fl.l_len = 1;
277 277
278#ifdef CONFIG_FEATURE_IPC_SYSLOG 278#ifdef CONFIG_FEATURE_IPC_SYSLOG
279 if ((circular_logging == TRUE) && (buf != NULL)){ 279 if ((circular_logging) && (buf != NULL)){
280 char b[1024]; 280 char b[1024];
281 va_start (arguments, fmt); 281 va_start (arguments, fmt);
282 vsprintf (b, fmt, arguments); 282 vsprintf (b, fmt, arguments);
@@ -366,7 +366,7 @@ static const int IOV_COUNT = 2;
366 "%s:%d",RemoteHost,RemotePort); 366 "%s:%d",RemoteHost,RemotePort);
367 } 367 }
368 } 368 }
369 if (local_logging == TRUE) 369 if (local_logging)
370#endif 370#endif
371 /* now spew out the message to wherever it is supposed to go */ 371 /* now spew out the message to wherever it is supposed to go */
372 message("%s %s %s %s\n", timestamp, LocalHostName, res, msg); 372 message("%s %s %s %s\n", timestamp, LocalHostName, res, msg);
@@ -519,13 +519,13 @@ static void doSyslogd (void)
519 FD_SET (sock_fd, &fds); 519 FD_SET (sock_fd, &fds);
520 520
521#ifdef CONFIG_FEATURE_IPC_SYSLOG 521#ifdef CONFIG_FEATURE_IPC_SYSLOG
522 if (circular_logging == TRUE ){ 522 if (circular_logging ){
523 ipcsyslog_init(); 523 ipcsyslog_init();
524 } 524 }
525#endif 525#endif
526 526
527 #ifdef CONFIG_FEATURE_REMOTE_LOG 527 #ifdef CONFIG_FEATURE_REMOTE_LOG
528 if (doRemoteLog == TRUE){ 528 if (doRemoteLog){
529 init_RemoteLog(); 529 init_RemoteLog();
530 } 530 }
531 #endif 531 #endif
@@ -616,7 +616,7 @@ extern int syslogd_main(int argc, char **argv)
616 616
617#ifdef CONFIG_FEATURE_REMOTE_LOG 617#ifdef CONFIG_FEATURE_REMOTE_LOG
618 /* If they have not specified remote logging, then log locally */ 618 /* If they have not specified remote logging, then log locally */
619 if (doRemoteLog == FALSE) 619 if (! doRemoteLog)
620 local_logging = TRUE; 620 local_logging = TRUE;
621#endif 621#endif
622 622
@@ -629,7 +629,7 @@ extern int syslogd_main(int argc, char **argv)
629 629
630 umask(0); 630 umask(0);
631 631
632 if (doFork == TRUE) { 632 if (doFork) {
633#if !defined(__UCLIBC__) || defined(__UCLIBC_HAS_MMU__) 633#if !defined(__UCLIBC__) || defined(__UCLIBC_HAS_MMU__)
634 if (daemon(0, 1) < 0) 634 if (daemon(0, 1) < 0)
635 perror_msg_and_die("daemon"); 635 perror_msg_and_die("daemon");
diff --git a/util-linux/mount.c b/util-linux/mount.c
index 755a3fb13..ae4417cb8 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -127,7 +127,7 @@ do_mount(char *specialfile, char *dir, char *filesystemtype,
127 char *lofile = NULL; 127 char *lofile = NULL;
128#endif 128#endif
129 129
130 if (fakeIt == FALSE) 130 if (! fakeIt)
131 { 131 {
132#if defined CONFIG_FEATURE_MOUNT_LOOP 132#if defined CONFIG_FEATURE_MOUNT_LOOP
133 if (use_loop==TRUE) { 133 if (use_loop==TRUE) {
@@ -163,7 +163,7 @@ do_mount(char *specialfile, char *dir, char *filesystemtype,
163 if (status == 0 || fakeIt==TRUE) { 163 if (status == 0 || fakeIt==TRUE) {
164 164
165#if defined CONFIG_FEATURE_MTAB_SUPPORT 165#if defined CONFIG_FEATURE_MTAB_SUPPORT
166 if (useMtab == TRUE) { 166 if (useMtab) {
167 erase_mtab(specialfile); // Clean any stale entries 167 erase_mtab(specialfile); // Clean any stale entries
168 write_mtab(specialfile, dir, filesystemtype, flags, mtab_opts); 168 write_mtab(specialfile, dir, filesystemtype, flags, mtab_opts);
169 } 169 }
@@ -210,19 +210,19 @@ parse_mount_options(char *options, int *flags, char *strflags)
210 f++; 210 f++;
211 } 211 }
212#if defined CONFIG_FEATURE_MOUNT_LOOP 212#if defined CONFIG_FEATURE_MOUNT_LOOP
213 if (gotone == FALSE && !strcasecmp("loop", options)) { /* loop device support */ 213 if (! gotone && !strcasecmp("loop", options)) { /* loop device support */
214 use_loop = TRUE; 214 use_loop = TRUE;
215 gotone = TRUE; 215 gotone = TRUE;
216 } 216 }
217#endif 217#endif
218 if (*strflags && strflags != '\0' && gotone == FALSE) { 218 if (*strflags && strflags != '\0' && ! gotone) {
219 char *temp = strflags; 219 char *temp = strflags;
220 220
221 temp += strlen(strflags); 221 temp += strlen(strflags);
222 *temp++ = ','; 222 *temp++ = ',';
223 *temp++ = '\0'; 223 *temp++ = '\0';
224 } 224 }
225 if (gotone == FALSE) 225 if (! gotone)
226 strcat(strflags, options); 226 strcat(strflags, options);
227 if (comma) { 227 if (comma) {
228 *comma = ','; 228 *comma = ',';
@@ -261,7 +261,7 @@ mount_one(char *blockDevice, char *directory, char *filesystemType,
261 status = do_mount(blockDevice, directory, filesystemType, 261 status = do_mount(blockDevice, directory, filesystemType,
262 flags | MS_MGC_VAL, string_flags, 262 flags | MS_MGC_VAL, string_flags,
263 useMtab, fakeIt, mtab_opts, mount_all); 263 useMtab, fakeIt, mtab_opts, mount_all);
264 if (status == TRUE) 264 if (status)
265 break; 265 break;
266 } 266 }
267 } 267 }
@@ -286,7 +286,7 @@ mount_one(char *blockDevice, char *directory, char *filesystemType,
286 status = do_mount(blockDevice, directory, filesystemType, 286 status = do_mount(blockDevice, directory, filesystemType,
287 flags | MS_MGC_VAL, string_flags, 287 flags | MS_MGC_VAL, string_flags,
288 useMtab, fakeIt, mtab_opts, mount_all); 288 useMtab, fakeIt, mtab_opts, mount_all);
289 if (status == TRUE) 289 if (status)
290 break; 290 break;
291 } 291 }
292 } 292 }
@@ -299,8 +299,8 @@ mount_one(char *blockDevice, char *directory, char *filesystemType,
299 fakeIt, mtab_opts, mount_all); 299 fakeIt, mtab_opts, mount_all);
300 } 300 }
301 301
302 if (status == FALSE) { 302 if (! status) {
303 if (whineOnErrors == TRUE) { 303 if (whineOnErrors) {
304 perror_msg("Mounting %s on %s failed", blockDevice, directory); 304 perror_msg("Mounting %s on %s failed", blockDevice, directory);
305 } 305 }
306 return (FALSE); 306 return (FALSE);
@@ -433,7 +433,7 @@ extern int mount_main(int argc, char **argv)
433 if (optind + 1 < argc) 433 if (optind + 1 < argc)
434 directory = simplify_path(argv[optind + 1]); 434 directory = simplify_path(argv[optind + 1]);
435 435
436 if (all == TRUE || optind + 1 == argc) { 436 if (all || optind + 1 == argc) {
437 struct mntent *m = NULL; 437 struct mntent *m = NULL;
438 FILE *f = setmntent("/etc/fstab", "r"); 438 FILE *f = setmntent("/etc/fstab", "r");
439 fstabmount = TRUE; 439 fstabmount = TRUE;
@@ -442,20 +442,20 @@ extern int mount_main(int argc, char **argv)
442 perror_msg_and_die( "\nCannot read /etc/fstab"); 442 perror_msg_and_die( "\nCannot read /etc/fstab");
443 443
444 while ((m = getmntent(f)) != NULL) { 444 while ((m = getmntent(f)) != NULL) {
445 if (all == FALSE && optind + 1 == argc && ( 445 if (! all && optind + 1 == argc && (
446 (strcmp(device, m->mnt_fsname) != 0) && 446 (strcmp(device, m->mnt_fsname) != 0) &&
447 (strcmp(device, m->mnt_dir) != 0) ) ) { 447 (strcmp(device, m->mnt_dir) != 0) ) ) {
448 continue; 448 continue;
449 } 449 }
450 450
451 if (all == TRUE && ( // If we're mounting 'all' 451 if (all && ( // If we're mounting 'all'
452 (strstr(m->mnt_opts, "noauto")) || // and the file system isn't noauto, 452 (strstr(m->mnt_opts, "noauto")) || // and the file system isn't noauto,
453 (strstr(m->mnt_type, "swap")) || // and isn't swap or nfs, then mount it 453 (strstr(m->mnt_type, "swap")) || // and isn't swap or nfs, then mount it
454 (strstr(m->mnt_type, "nfs")) ) ) { 454 (strstr(m->mnt_type, "nfs")) ) ) {
455 continue; 455 continue;
456 } 456 }
457 457
458 if (all == TRUE || flags == 0) { // Allow single mount to override fstab flags 458 if (all || flags == 0) { // Allow single mount to override fstab flags
459 flags = 0; 459 flags = 0;
460 string_flags = string_flags_buf; 460 string_flags = string_flags_buf;
461 *string_flags = '\0'; 461 *string_flags = '\0';
@@ -483,13 +483,13 @@ singlemount:
483 string_flags, useMtab, fakeIt, extra_opts, TRUE, all)) 483 string_flags, useMtab, fakeIt, extra_opts, TRUE, all))
484 rc = EXIT_FAILURE; 484 rc = EXIT_FAILURE;
485 485
486 if (all == FALSE) 486 if (! all)
487 break; 487 break;
488 } 488 }
489 if (fstabmount == TRUE) 489 if (fstabmount)
490 endmntent(f); 490 endmntent(f);
491 491
492 if (all == FALSE && fstabmount == TRUE && m == NULL) 492 if (! all && fstabmount && m == NULL)
493 fprintf(stderr, "Can't find %s in /etc/fstab\n", device); 493 fprintf(stderr, "Can't find %s in /etc/fstab\n", device);
494 494
495 return rc; 495 return rc;
diff --git a/util-linux/umount.c b/util-linux/umount.c
index 99db3084c..29e2e3b66 100644
--- a/util-linux/umount.c
+++ b/util-linux/umount.c
@@ -179,19 +179,19 @@ static int do_umount(const char *name)
179 status = umount(name); 179 status = umount(name);
180 180
181#if defined CONFIG_FEATURE_MOUNT_LOOP 181#if defined CONFIG_FEATURE_MOUNT_LOOP
182 if (freeLoop == TRUE && blockDevice != NULL && !strncmp("/dev/loop", blockDevice, 9)) 182 if (freeLoop && blockDevice != NULL && !strncmp("/dev/loop", blockDevice, 9))
183 /* this was a loop device, delete it */ 183 /* this was a loop device, delete it */
184 del_loop(blockDevice); 184 del_loop(blockDevice);
185#endif 185#endif
186#if defined CONFIG_FEATURE_MOUNT_FORCE 186#if defined CONFIG_FEATURE_MOUNT_FORCE
187 if (status != 0 && doForce == TRUE) { 187 if (status != 0 && doForce) {
188 status = umount2(blockDevice, MNT_FORCE); 188 status = umount2(blockDevice, MNT_FORCE);
189 if (status != 0) { 189 if (status != 0) {
190 error_msg_and_die("forced umount of %s failed!", blockDevice); 190 error_msg_and_die("forced umount of %s failed!", blockDevice);
191 } 191 }
192 } 192 }
193#endif 193#endif
194 if (status != 0 && doRemount == TRUE && errno == EBUSY) { 194 if (status != 0 && doRemount && errno == EBUSY) {
195 status = mount(blockDevice, name, NULL, 195 status = mount(blockDevice, name, NULL,
196 MS_MGC_VAL | MS_REMOUNT | MS_RDONLY, NULL); 196 MS_MGC_VAL | MS_REMOUNT | MS_RDONLY, NULL);
197 if (status == 0) { 197 if (status == 0) {
@@ -202,7 +202,7 @@ static int do_umount(const char *name)
202 } 202 }
203 if (status == 0) { 203 if (status == 0) {
204#if defined CONFIG_FEATURE_MTAB_SUPPORT 204#if defined CONFIG_FEATURE_MTAB_SUPPORT
205 if (useMtab == TRUE) 205 if (useMtab)
206 erase_mtab(name); 206 erase_mtab(name);
207#endif 207#endif
208 return (TRUE); 208 return (TRUE);
@@ -282,15 +282,15 @@ extern int umount_main(int argc, char **argv)
282 } 282 }
283 283
284 mtab_read(); 284 mtab_read();
285 if (umountAll == TRUE) { 285 if (umountAll) {
286 if (umount_all() == TRUE) 286 if (umount_all())
287 return EXIT_SUCCESS; 287 return EXIT_SUCCESS;
288 else 288 else
289 return EXIT_FAILURE; 289 return EXIT_FAILURE;
290 } 290 }
291 if (realpath(*argv, path) == NULL) 291 if (realpath(*argv, path) == NULL)
292 perror_msg_and_die("%s", path); 292 perror_msg_and_die("%s", path);
293 if (do_umount(path) == TRUE) 293 if (do_umount(path))
294 return EXIT_SUCCESS; 294 return EXIT_SUCCESS;
295 perror_msg_and_die("%s", *argv); 295 perror_msg_and_die("%s", *argv);
296} 296}
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-22 15:47:17 +0000