Skip to content

Commit eaf53b1

Browse files
dtolnaytgross35
dtolnay
authored and
tgross35
committed
Convert mode_t constants to octal
(backport <rust-lang#3634>) (cherry picked from commit 3cc3f01)
1 parent 956717f commit eaf53b1

File tree

19 files changed

+360
-360
lines changed

19 files changed

+360
-360
lines changed

‎src/fuchsia/mod.rs

Lines changed: 23 additions & 23 deletions
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

Lines changed: 9 additions & 9 deletions
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

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1617,29 +1617,29 @@ pub const MADV_WILLNEED: ::c_int = 3;
16171617
pub const MADV_DONTNEED: ::c_int = 4;
16181618

16191619
// sys/mode.h
1620-
pub const S_IFMT: mode_t = 0o170000;
1621-
pub const S_IFREG: mode_t = 0o100000;
1622-
pub const S_IFDIR: mode_t = 0o40000;
1623-
pub const S_IFBLK: mode_t = 0o60000;
1624-
pub const S_IFCHR: mode_t = 0o20000;
1625-
pub const S_IFIFO: mode_t = 0o10000;
1626-
pub const S_IRWXU: mode_t = 0o700;
1627-
pub const S_IRUSR: mode_t = 0o400;
1628-
pub const S_IWUSR: mode_t = 0o200;
1629-
pub const S_IXUSR: mode_t = 0o100;
1630-
pub const S_IRWXG: mode_t = 0o70;
1631-
pub const S_IRGRP: mode_t = 0o40;
1632-
pub const S_IWGRP: mode_t = 0o20;
1633-
pub const S_IXGRP: mode_t = 0o10;
1634-
pub const S_IRWXO: mode_t = 7;
1635-
pub const S_IROTH: mode_t = 4;
1636-
pub const S_IWOTH: mode_t = 2;
1637-
pub const S_IXOTH: mode_t = 1;
1638-
pub const S_IFLNK: mode_t = 0o120000;
1639-
pub const S_IFSOCK: mode_t = 0o140000;
1640-
pub const S_IEXEC: mode_t = 0o100;
1641-
pub const S_IWRITE: mode_t = 0o200;
1642-
pub const S_IREAD: mode_t = 0o400;
1620+
pub const S_IFMT: mode_t = 0o17_0000;
1621+
pub const S_IFREG: mode_t = 0o10_0000;
1622+
pub const S_IFDIR: mode_t = 0o4_0000;
1623+
pub const S_IFBLK: mode_t = 0o6_0000;
1624+
pub const S_IFCHR: mode_t = 0o2_0000;
1625+
pub const S_IFIFO: mode_t = 0o1_0000;
1626+
pub const S_IRWXU: mode_t = 0o0700;
1627+
pub const S_IRUSR: mode_t = 0o0400;
1628+
pub const S_IWUSR: mode_t = 0o0200;
1629+
pub const S_IXUSR: mode_t = 0o0100;
1630+
pub const S_IRWXG: mode_t = 0o0070;
1631+
pub const S_IRGRP: mode_t = 0o0040;
1632+
pub const S_IWGRP: mode_t = 0o0020;
1633+
pub const S_IXGRP: mode_t = 0o0010;
1634+
pub const S_IRWXO: mode_t = 0o0007;
1635+
pub const S_IROTH: mode_t = 0o0004;
1636+
pub const S_IWOTH: mode_t = 0o0002;
1637+
pub const S_IXOTH: mode_t = 0o0001;
1638+
pub const S_IFLNK: mode_t = 0o12_0000;
1639+
pub const S_IFSOCK: mode_t = 0o14_0000;
1640+
pub const S_IEXEC: mode_t = 0o0100;
1641+
pub const S_IWRITE: mode_t = 0o0200;
1642+
pub const S_IREAD: mode_t = 0o0400;
16431643

16441644
// sys/msg.h
16451645
pub const MSG_NOERROR: ::c_int = 0o10000;

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

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3272,29 +3272,29 @@ pub const O_CLOEXEC: ::c_int = 0x01000000;
32723272
pub const O_NOFOLLOW_ANY: ::c_int = 0x20000000;
32733273
pub const O_EXEC: ::c_int = 0x40000000;
32743274
pub const O_SEARCH: ::c_int = O_EXEC | O_DIRECTORY;
3275-
pub const S_IFIFO: mode_t = 4096;
3276-
pub const S_IFCHR: mode_t = 8192;
3277-
pub const S_IFBLK: mode_t = 24576;
3278-
pub const S_IFDIR: mode_t = 16384;
3279-
pub const S_IFREG: mode_t = 32768;
3280-
pub const S_IFLNK: mode_t = 40960;
3281-
pub const S_IFSOCK: mode_t = 49152;
3282-
pub const S_IFMT: mode_t = 61440;
3283-
pub const S_IEXEC: mode_t = 64;
3284-
pub const S_IWRITE: mode_t = 128;
3285-
pub const S_IREAD: mode_t = 256;
3286-
pub const S_IRWXU: mode_t = 448;
3287-
pub const S_IXUSR: mode_t = 64;
3288-
pub const S_IWUSR: mode_t = 128;
3289-
pub const S_IRUSR: mode_t = 256;
3290-
pub const S_IRWXG: mode_t = 56;
3291-
pub const S_IXGRP: mode_t = 8;
3292-
pub const S_IWGRP: mode_t = 16;
3293-
pub const S_IRGRP: mode_t = 32;
3294-
pub const S_IRWXO: mode_t = 7;
3295-
pub const S_IXOTH: mode_t = 1;
3296-
pub const S_IWOTH: mode_t = 2;
3297-
pub const S_IROTH: mode_t = 4;
3275+
pub const S_IFIFO: mode_t = 0o1_0000;
3276+
pub const S_IFCHR: mode_t = 0o2_0000;
3277+
pub const S_IFBLK: mode_t = 0o6_0000;
3278+
pub const S_IFDIR: mode_t = 0o4_0000;
3279+
pub const S_IFREG: mode_t = 0o10_0000;
3280+
pub const S_IFLNK: mode_t = 0o12_0000;
3281+
pub const S_IFSOCK: mode_t = 0o14_0000;
3282+
pub const S_IFMT: mode_t = 0o17_0000;
3283+
pub const S_IEXEC: mode_t = 0o0100;
3284+
pub const S_IWRITE: mode_t = 0o0200;
3285+
pub const S_IREAD: mode_t = 0o0400;
3286+
pub const S_IRWXU: mode_t = 0o0700;
3287+
pub const S_IXUSR: mode_t = 0o0100;
3288+
pub const S_IWUSR: mode_t = 0o0200;
3289+
pub const S_IRUSR: mode_t = 0o0400;
3290+
pub const S_IRWXG: mode_t = 0o0070;
3291+
pub const S_IXGRP: mode_t = 0o0010;
3292+
pub const S_IWGRP: mode_t = 0o0020;
3293+
pub const S_IRGRP: mode_t = 0o0040;
3294+
pub const S_IRWXO: mode_t = 0o0007;
3295+
pub const S_IXOTH: mode_t = 0o0001;
3296+
pub const S_IWOTH: mode_t = 0o0002;
3297+
pub const S_IROTH: mode_t = 0o0004;
32983298
pub const F_OK: ::c_int = 0;
32993299
pub const R_OK: ::c_int = 4;
33003300
pub const W_OK: ::c_int = 2;

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

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -563,29 +563,29 @@ pub const TMP_MAX: ::c_uint = 308915776;
563563
pub const O_NOCTTY: ::c_int = 32768;
564564
pub const O_DIRECT: ::c_int = 0x00010000;
565565

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

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

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

‎src/unix/haiku/mod.rs

Lines changed: 21 additions & 21 deletions
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)