Skip to content

Commit 82806b3

Browse files
JohnTitorJohnTitor
authored
Merge pull request #3634 from dtolnay-contrib/mode_t
Convert mode_t constants to octal
2 parents f1669fd + 3cc3f01 commit 82806b3

File tree

19 files changed

+362
-362
lines changed

19 files changed

+362
-362
lines changed

‎src/fuchsia/mod.rs

+23-23
Original file line numberDiff line numberDiff line change
@@ -1467,26 +1467,26 @@ pub const O_RDONLY: ::c_int = 0;
14671467
pub const O_WRONLY: ::c_int = 1;
14681468
pub const O_RDWR: ::c_int = 2;
14691469

1470-
pub const S_IFIFO: ::mode_t = 4096;
1471-
pub const S_IFCHR: ::mode_t = 8192;
1472-
pub const S_IFBLK: ::mode_t = 24576;
1473-
pub const S_IFDIR: ::mode_t = 16384;
1474-
pub const S_IFREG: ::mode_t = 32768;
1475-
pub const S_IFLNK: ::mode_t = 40960;
1476-
pub const S_IFSOCK: ::mode_t = 49152;
1477-
pub const S_IFMT: ::mode_t = 61440;
1478-
pub const S_IRWXU: ::mode_t = 448;
1479-
pub const S_IXUSR: ::mode_t = 64;
1480-
pub const S_IWUSR: ::mode_t = 128;
1481-
pub const S_IRUSR: ::mode_t = 256;
1482-
pub const S_IRWXG: ::mode_t = 56;
1483-
pub const S_IXGRP: ::mode_t = 8;
1484-
pub const S_IWGRP: ::mode_t = 16;
1485-
pub const S_IRGRP: ::mode_t = 32;
1486-
pub const S_IRWXO: ::mode_t = 7;
1487-
pub const S_IXOTH: ::mode_t = 1;
1488-
pub const S_IWOTH: ::mode_t = 2;
1489-
pub const S_IROTH: ::mode_t = 4;
1470+
pub const S_IFIFO: ::mode_t = 0o1_0000;
1471+
pub const S_IFCHR: ::mode_t = 0o2_0000;
1472+
pub const S_IFBLK: ::mode_t = 0o6_0000;
1473+
pub const S_IFDIR: ::mode_t = 0o4_0000;
1474+
pub const S_IFREG: ::mode_t = 0o10_0000;
1475+
pub const S_IFLNK: ::mode_t = 0o12_0000;
1476+
pub const S_IFSOCK: ::mode_t = 0o14_0000;
1477+
pub const S_IFMT: ::mode_t = 0o17_0000;
1478+
pub const S_IRWXU: ::mode_t = 0o0700;
1479+
pub const S_IXUSR: ::mode_t = 0o0100;
1480+
pub const S_IWUSR: ::mode_t = 0o0200;
1481+
pub const S_IRUSR: ::mode_t = 0o0400;
1482+
pub const S_IRWXG: ::mode_t = 0o0070;
1483+
pub const S_IXGRP: ::mode_t = 0o0010;
1484+
pub const S_IWGRP: ::mode_t = 0o0020;
1485+
pub const S_IRGRP: ::mode_t = 0o0040;
1486+
pub const S_IRWXO: ::mode_t = 0o0007;
1487+
pub const S_IXOTH: ::mode_t = 0o0001;
1488+
pub const S_IWOTH: ::mode_t = 0o0002;
1489+
pub const S_IROTH: ::mode_t = 0o0004;
14901490
pub const F_OK: ::c_int = 0;
14911491
pub const R_OK: ::c_int = 4;
14921492
pub const W_OK: ::c_int = 2;
@@ -2283,9 +2283,9 @@ pub const POSIX_MADV_RANDOM: ::c_int = 1;
22832283
pub const POSIX_MADV_SEQUENTIAL: ::c_int = 2;
22842284
pub const POSIX_MADV_WILLNEED: ::c_int = 3;
22852285

2286-
pub const S_IEXEC: mode_t = 64;
2287-
pub const S_IWRITE: mode_t = 128;
2288-
pub const S_IREAD: mode_t = 256;
2286+
pub const S_IEXEC: mode_t = 0o0100;
2287+
pub const S_IWRITE: mode_t = 0o0200;
2288+
pub const S_IREAD: mode_t = 0o0400;
22892289

22902290
pub const F_LOCK: ::c_int = 1;
22912291
pub const F_TEST: ::c_int = 3;

‎src/solid/mod.rs

+9-9
Original file line numberDiff line numberDiff line change
@@ -209,15 +209,15 @@ pub const O_EXCL: c_int = 0x400;
209209
pub const O_TEXT: c_int = 0x100;
210210
pub const O_BINARY: c_int = 0x200;
211211
pub const O_TRUNC: c_int = 0x20;
212-
pub const S_IEXEC: c_short = 0x0040;
213-
pub const S_IWRITE: c_short = 0x0080;
214-
pub const S_IREAD: c_short = 0x0100;
215-
pub const S_IFCHR: c_short = 0x2000;
216-
pub const S_IFDIR: c_short = 0x4000;
217-
pub const S_IFMT: c_short = 0o160000;
218-
pub const S_IFIFO: c_short = 0o0010000;
219-
pub const S_IFBLK: c_short = 0o0060000;
220-
pub const S_IFREG: c_short = 0o0100000;
212+
pub const S_IEXEC: c_short = 0o0100;
213+
pub const S_IWRITE: c_short = 0o0200;
214+
pub const S_IREAD: c_short = 0o0400;
215+
pub const S_IFCHR: c_short = 0o2_0000;
216+
pub const S_IFDIR: c_short = 0o4_0000;
217+
pub const S_IFMT: c_short = 0o16_0000;
218+
pub const S_IFIFO: c_short = 0o1_0000;
219+
pub const S_IFBLK: c_short = 0o6_0000;
220+
pub const S_IFREG: c_short = 0o10_0000;
221221

222222
pub const LC_ALL: c_int = 0;
223223
pub const LC_COLLATE: c_int = 1;

‎src/unix/aix/mod.rs

+23-23
Original file line numberDiff line numberDiff line change
@@ -1591,29 +1591,29 @@ pub const MADV_WILLNEED: ::c_int = 3;
15911591
pub const MADV_DONTNEED: ::c_int = 4;
15921592

15931593
// sys/mode.h
1594-
pub const S_IFMT: mode_t = 0o170000;
1595-
pub const S_IFREG: mode_t = 0o100000;
1596-
pub const S_IFDIR: mode_t = 0o40000;
1597-
pub const S_IFBLK: mode_t = 0o60000;
1598-
pub const S_IFCHR: mode_t = 0o20000;
1599-
pub const S_IFIFO: mode_t = 0o10000;
1600-
pub const S_IRWXU: mode_t = 0o700;
1601-
pub const S_IRUSR: mode_t = 0o400;
1602-
pub const S_IWUSR: mode_t = 0o200;
1603-
pub const S_IXUSR: mode_t = 0o100;
1604-
pub const S_IRWXG: mode_t = 0o70;
1605-
pub const S_IRGRP: mode_t = 0o40;
1606-
pub const S_IWGRP: mode_t = 0o20;
1607-
pub const S_IXGRP: mode_t = 0o10;
1608-
pub const S_IRWXO: mode_t = 7;
1609-
pub const S_IROTH: mode_t = 4;
1610-
pub const S_IWOTH: mode_t = 2;
1611-
pub const S_IXOTH: mode_t = 1;
1612-
pub const S_IFLNK: mode_t = 0o120000;
1613-
pub const S_IFSOCK: mode_t = 0o140000;
1614-
pub const S_IEXEC: mode_t = 0o100;
1615-
pub const S_IWRITE: mode_t = 0o200;
1616-
pub const S_IREAD: mode_t = 0o400;
1594+
pub const S_IFMT: mode_t = 0o17_0000;
1595+
pub const S_IFREG: mode_t = 0o10_0000;
1596+
pub const S_IFDIR: mode_t = 0o4_0000;
1597+
pub const S_IFBLK: mode_t = 0o6_0000;
1598+
pub const S_IFCHR: mode_t = 0o2_0000;
1599+
pub const S_IFIFO: mode_t = 0o1_0000;
1600+
pub const S_IRWXU: mode_t = 0o0700;
1601+
pub const S_IRUSR: mode_t = 0o0400;
1602+
pub const S_IWUSR: mode_t = 0o0200;
1603+
pub const S_IXUSR: mode_t = 0o0100;
1604+
pub const S_IRWXG: mode_t = 0o0070;
1605+
pub const S_IRGRP: mode_t = 0o0040;
1606+
pub const S_IWGRP: mode_t = 0o0020;
1607+
pub const S_IXGRP: mode_t = 0o0010;
1608+
pub const S_IRWXO: mode_t = 0o0007;
1609+
pub const S_IROTH: mode_t = 0o0004;
1610+
pub const S_IWOTH: mode_t = 0o0002;
1611+
pub const S_IXOTH: mode_t = 0o0001;
1612+
pub const S_IFLNK: mode_t = 0o12_0000;
1613+
pub const S_IFSOCK: mode_t = 0o14_0000;
1614+
pub const S_IEXEC: mode_t = 0o0100;
1615+
pub const S_IWRITE: mode_t = 0o0200;
1616+
pub const S_IREAD: mode_t = 0o0400;
16171617

16181618
// sys/msg.h
16191619
pub const MSG_NOERROR: ::c_int = 0o10000;

‎src/unix/bsd/apple/mod.rs

+23-23
Original file line numberDiff line numberDiff line change
@@ -3166,29 +3166,29 @@ pub const O_SYMLINK: ::c_int = 0x00200000;
31663166
pub const O_DSYNC: ::c_int = 0x00400000;
31673167
pub const O_CLOEXEC: ::c_int = 0x01000000;
31683168
pub const O_NOFOLLOW_ANY: ::c_int = 0x20000000;
3169-
pub const S_IFIFO: mode_t = 4096;
3170-
pub const S_IFCHR: mode_t = 8192;
3171-
pub const S_IFBLK: mode_t = 24576;
3172-
pub const S_IFDIR: mode_t = 16384;
3173-
pub const S_IFREG: mode_t = 32768;
3174-
pub const S_IFLNK: mode_t = 40960;
3175-
pub const S_IFSOCK: mode_t = 49152;
3176-
pub const S_IFMT: mode_t = 61440;
3177-
pub const S_IEXEC: mode_t = 64;
3178-
pub const S_IWRITE: mode_t = 128;
3179-
pub const S_IREAD: mode_t = 256;
3180-
pub const S_IRWXU: mode_t = 448;
3181-
pub const S_IXUSR: mode_t = 64;
3182-
pub const S_IWUSR: mode_t = 128;
3183-
pub const S_IRUSR: mode_t = 256;
3184-
pub const S_IRWXG: mode_t = 56;
3185-
pub const S_IXGRP: mode_t = 8;
3186-
pub const S_IWGRP: mode_t = 16;
3187-
pub const S_IRGRP: mode_t = 32;
3188-
pub const S_IRWXO: mode_t = 7;
3189-
pub const S_IXOTH: mode_t = 1;
3190-
pub const S_IWOTH: mode_t = 2;
3191-
pub const S_IROTH: mode_t = 4;
3169+
pub const S_IFIFO: mode_t = 0o1_0000;
3170+
pub const S_IFCHR: mode_t = 0o2_0000;
3171+
pub const S_IFBLK: mode_t = 0o6_0000;
3172+
pub const S_IFDIR: mode_t = 0o4_0000;
3173+
pub const S_IFREG: mode_t = 0o10_0000;
3174+
pub const S_IFLNK: mode_t = 0o12_0000;
3175+
pub const S_IFSOCK: mode_t = 0o14_0000;
3176+
pub const S_IFMT: mode_t = 0o17_0000;
3177+
pub const S_IEXEC: mode_t = 0o0100;
3178+
pub const S_IWRITE: mode_t = 0o0200;
3179+
pub const S_IREAD: mode_t = 0o0400;
3180+
pub const S_IRWXU: mode_t = 0o0700;
3181+
pub const S_IXUSR: mode_t = 0o0100;
3182+
pub const S_IWUSR: mode_t = 0o0200;
3183+
pub const S_IRUSR: mode_t = 0o0400;
3184+
pub const S_IRWXG: mode_t = 0o0070;
3185+
pub const S_IXGRP: mode_t = 0o0010;
3186+
pub const S_IWGRP: mode_t = 0o0020;
3187+
pub const S_IRGRP: mode_t = 0o0040;
3188+
pub const S_IRWXO: mode_t = 0o0007;
3189+
pub const S_IXOTH: mode_t = 0o0001;
3190+
pub const S_IWOTH: mode_t = 0o0002;
3191+
pub const S_IROTH: mode_t = 0o0004;
31923192
pub const F_OK: ::c_int = 0;
31933193
pub const R_OK: ::c_int = 4;
31943194
pub const W_OK: ::c_int = 2;

‎src/unix/bsd/freebsdlike/mod.rs

+23-23
Original file line numberDiff line numberDiff line change
@@ -555,29 +555,29 @@ pub const TMP_MAX: ::c_uint = 308915776;
555555
pub const O_NOCTTY: ::c_int = 32768;
556556
pub const O_DIRECT: ::c_int = 0x00010000;
557557

558-
pub const S_IFIFO: mode_t = 4096;
559-
pub const S_IFCHR: mode_t = 8192;
560-
pub const S_IFBLK: mode_t = 24576;
561-
pub const S_IFDIR: mode_t = 16384;
562-
pub const S_IFREG: mode_t = 32768;
563-
pub const S_IFLNK: mode_t = 40960;
564-
pub const S_IFSOCK: mode_t = 49152;
565-
pub const S_IFMT: mode_t = 61440;
566-
pub const S_IEXEC: mode_t = 64;
567-
pub const S_IWRITE: mode_t = 128;
568-
pub const S_IREAD: mode_t = 256;
569-
pub const S_IRWXU: mode_t = 448;
570-
pub const S_IXUSR: mode_t = 64;
571-
pub const S_IWUSR: mode_t = 128;
572-
pub const S_IRUSR: mode_t = 256;
573-
pub const S_IRWXG: mode_t = 56;
574-
pub const S_IXGRP: mode_t = 8;
575-
pub const S_IWGRP: mode_t = 16;
576-
pub const S_IRGRP: mode_t = 32;
577-
pub const S_IRWXO: mode_t = 7;
578-
pub const S_IXOTH: mode_t = 1;
579-
pub const S_IWOTH: mode_t = 2;
580-
pub const S_IROTH: mode_t = 4;
558+
pub const S_IFIFO: mode_t = 0o1_0000;
559+
pub const S_IFCHR: mode_t = 0o2_0000;
560+
pub const S_IFBLK: mode_t = 0o6_0000;
561+
pub const S_IFDIR: mode_t = 0o4_0000;
562+
pub const S_IFREG: mode_t = 0o10_0000;
563+
pub const S_IFLNK: mode_t = 0o12_0000;
564+
pub const S_IFSOCK: mode_t = 0o14_0000;
565+
pub const S_IFMT: mode_t = 0o17_0000;
566+
pub const S_IEXEC: mode_t = 0o0100;
567+
pub const S_IWRITE: mode_t = 0o0200;
568+
pub const S_IREAD: mode_t = 0o0400;
569+
pub const S_IRWXU: mode_t = 0o0700;
570+
pub const S_IXUSR: mode_t = 0o0100;
571+
pub const S_IWUSR: mode_t = 0o0200;
572+
pub const S_IRUSR: mode_t = 0o0400;
573+
pub const S_IRWXG: mode_t = 0o0070;
574+
pub const S_IXGRP: mode_t = 0o0010;
575+
pub const S_IWGRP: mode_t = 0o0020;
576+
pub const S_IRGRP: mode_t = 0o0040;
577+
pub const S_IRWXO: mode_t = 0o0007;
578+
pub const S_IXOTH: mode_t = 0o0001;
579+
pub const S_IWOTH: mode_t = 0o0002;
580+
pub const S_IROTH: mode_t = 0o0004;
581581
pub const F_OK: ::c_int = 0;
582582
pub const R_OK: ::c_int = 4;
583583
pub const W_OK: ::c_int = 2;

‎src/unix/bsd/netbsdlike/mod.rs

+23-23
Original file line numberDiff line numberDiff line change
@@ -168,29 +168,29 @@ pub const FOPEN_MAX: ::c_uint = 20;
168168
pub const FILENAME_MAX: ::c_uint = 1024;
169169
pub const L_tmpnam: ::c_uint = 1024;
170170
pub const O_NOCTTY: ::c_int = 32768;
171-
pub const S_IFIFO: mode_t = 4096;
172-
pub const S_IFCHR: mode_t = 8192;
173-
pub const S_IFBLK: mode_t = 24576;
174-
pub const S_IFDIR: mode_t = 16384;
175-
pub const S_IFREG: mode_t = 32768;
176-
pub const S_IFLNK: mode_t = 40960;
177-
pub const S_IFSOCK: mode_t = 49152;
178-
pub const S_IFMT: mode_t = 61440;
179-
pub const S_IEXEC: mode_t = 64;
180-
pub const S_IWRITE: mode_t = 128;
181-
pub const S_IREAD: mode_t = 256;
182-
pub const S_IRWXU: mode_t = 448;
183-
pub const S_IXUSR: mode_t = 64;
184-
pub const S_IWUSR: mode_t = 128;
185-
pub const S_IRUSR: mode_t = 256;
186-
pub const S_IRWXG: mode_t = 56;
187-
pub const S_IXGRP: mode_t = 8;
188-
pub const S_IWGRP: mode_t = 16;
189-
pub const S_IRGRP: mode_t = 32;
190-
pub const S_IRWXO: mode_t = 7;
191-
pub const S_IXOTH: mode_t = 1;
192-
pub const S_IWOTH: mode_t = 2;
193-
pub const S_IROTH: mode_t = 4;
171+
pub const S_IFIFO: mode_t = 0o1_0000;
172+
pub const S_IFCHR: mode_t = 0o2_0000;
173+
pub const S_IFBLK: mode_t = 0o6_0000;
174+
pub const S_IFDIR: mode_t = 0o4_0000;
175+
pub const S_IFREG: mode_t = 0o10_0000;
176+
pub const S_IFLNK: mode_t = 0o12_0000;
177+
pub const S_IFSOCK: mode_t = 0o14_0000;
178+
pub const S_IFMT: mode_t = 0o17_0000;
179+
pub const S_IEXEC: mode_t = 0o0100;
180+
pub const S_IWRITE: mode_t = 0o0200;
181+
pub const S_IREAD: mode_t = 0o0400;
182+
pub const S_IRWXU: mode_t = 0o0700;
183+
pub const S_IXUSR: mode_t = 0o0100;
184+
pub const S_IWUSR: mode_t = 0o0200;
185+
pub const S_IRUSR: mode_t = 0o0400;
186+
pub const S_IRWXG: mode_t = 0o0070;
187+
pub const S_IXGRP: mode_t = 0o0010;
188+
pub const S_IWGRP: mode_t = 0o0020;
189+
pub const S_IRGRP: mode_t = 0o0040;
190+
pub const S_IRWXO: mode_t = 0o0007;
191+
pub const S_IXOTH: mode_t = 0o0001;
192+
pub const S_IWOTH: mode_t = 0o0002;
193+
pub const S_IROTH: mode_t = 0o0004;
194194
pub const F_OK: ::c_int = 0;
195195
pub const R_OK: ::c_int = 4;
196196
pub const W_OK: ::c_int = 2;

‎src/unix/haiku/mod.rs

+21-21
Original file line numberDiff line numberDiff line change
@@ -771,27 +771,27 @@ pub const O_NOFOLLOW: ::c_int = 0x00080000;
771771
pub const O_NOCACHE: ::c_int = 0x00100000;
772772
pub const O_DIRECTORY: ::c_int = 0x00200000;
773773

774-
pub const S_IFIFO: ::mode_t = 4096;
775-
pub const S_IFCHR: ::mode_t = 8192;
776-
pub const S_IFBLK: ::mode_t = 24576;
777-
pub const S_IFDIR: ::mode_t = 16384;
778-
pub const S_IFREG: ::mode_t = 32768;
779-
pub const S_IFLNK: ::mode_t = 40960;
780-
pub const S_IFSOCK: ::mode_t = 49152;
781-
pub const S_IFMT: ::mode_t = 61440;
782-
783-
pub const S_IRWXU: ::mode_t = 0o00700;
784-
pub const S_IRUSR: ::mode_t = 0o00400;
785-
pub const S_IWUSR: ::mode_t = 0o00200;
786-
pub const S_IXUSR: ::mode_t = 0o00100;
787-
pub const S_IRWXG: ::mode_t = 0o00070;
788-
pub const S_IRGRP: ::mode_t = 0o00040;
789-
pub const S_IWGRP: ::mode_t = 0o00020;
790-
pub const S_IXGRP: ::mode_t = 0o00010;
791-
pub const S_IRWXO: ::mode_t = 0o00007;
792-
pub const S_IROTH: ::mode_t = 0o00004;
793-
pub const S_IWOTH: ::mode_t = 0o00002;
794-
pub const S_IXOTH: ::mode_t = 0o00001;
774+
pub const S_IFIFO: ::mode_t = 0o1_0000;
775+
pub const S_IFCHR: ::mode_t = 0o2_0000;
776+
pub const S_IFBLK: ::mode_t = 0o6_0000;
777+
pub const S_IFDIR: ::mode_t = 0o4_0000;
778+
pub const S_IFREG: ::mode_t = 0o10_0000;
779+
pub const S_IFLNK: ::mode_t = 0o12_0000;
780+
pub const S_IFSOCK: ::mode_t = 0o14_0000;
781+
pub const S_IFMT: ::mode_t = 0o17_0000;
782+
783+
pub const S_IRWXU: ::mode_t = 0o0700;
784+
pub const S_IRUSR: ::mode_t = 0o0400;
785+
pub const S_IWUSR: ::mode_t = 0o0200;
786+
pub const S_IXUSR: ::mode_t = 0o0100;
787+
pub const S_IRWXG: ::mode_t = 0o0070;
788+
pub const S_IRGRP: ::mode_t = 0o0040;
789+
pub const S_IWGRP: ::mode_t = 0o0020;
790+
pub const S_IXGRP: ::mode_t = 0o0010;
791+
pub const S_IRWXO: ::mode_t = 0o0007;
792+
pub const S_IROTH: ::mode_t = 0o0004;
793+
pub const S_IWOTH: ::mode_t = 0o0002;
794+
pub const S_IXOTH: ::mode_t = 0o0001;
795795

796796
pub const F_OK: ::c_int = 0;
797797
pub const R_OK: ::c_int = 4;

0 commit comments

Comments
 (0)