glm94/pdp7-unix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fsck7/mkfs7/proto/password: interpret/dislpay uids strictly as octal

Browse Source
This commit is contained in:
phil
2019-10-26 01:14:55 -04:00
parent bceda25306
commit 9f818a984b
4 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/fs/password
+3 -3
View File
@@ -1,5 +1,5 @@
system:system:system:777777 system:system:system:777777
ken:ken:ken:10 ken:ken:ken:10
dmr:dmr:dmr:12 dmr:dmr:dmr:11
bwk:bwk:bwk:14 bwk:bwk:bwk:12
doug:doug:doug:15 doug:doug:doug:14
build/proto
+18 -18
View File
@@ -74,27 +74,27 @@ dd drwr- -1 4
trysys.s frwr- 10 ../src/sys/trysys.s trysys.s frwr- 10 ../src/sys/trysys.s
sys.rc frwr- 10 fs/sys.rc sys.rc frwr- 10 fs/sys.rc
$ $
dmr drwr- 12 dmr drwr- 11
system l---- 3 system l---- 3
as.s frwr- 12 ../src/cmd/as.s as.s frwr- 11 ../src/cmd/as.s
op.s frwr- 12 ../src/cmd/op.s op.s frwr- 11 ../src/cmd/op.s
$ $
bwk drwr- 14 bwk drwr- 12
system l---- 3 system l---- 3
b_readme frwr- 14 fs/b_readme b_readme frwr- 12 fs/b_readme
bi.s frwr- 14 ../src/cmd/bi.s bi.s frwr- 12 ../src/cmd/bi.s
bl.s frwr- 14 ../src/cmd/bl.s bl.s frwr- 12 ../src/cmd/bl.s
db.s frwr- 14 ../src/cmd/db.s db.s frwr- 12 ../src/cmd/db.s
hello.b frwr- 14 ../src/other/hello.b hello.b frwr- 12 ../src/other/hello.b
$ $
doug drwr- 15 doug drwr- 14
system l---- 3 system l---- 3
t1.s frwr- 15 ../src/cmd/t1.s t1.s frwr- 14 ../src/cmd/t1.s
t2.s frwr- 15 ../src/cmd/t2.s t2.s frwr- 14 ../src/cmd/t2.s
t3.s frwr- 15 ../src/cmd/t3.s t3.s frwr- 14 ../src/cmd/t3.s
t4.s frwr- 15 ../src/cmd/t4.s t4.s frwr- 14 ../src/cmd/t4.s
t5.s frwr- 15 ../src/cmd/t5.s t5.s frwr- 14 ../src/cmd/t5.s
t6.s frwr- 15 ../src/cmd/t6.s t6.s frwr- 14 ../src/cmd/t6.s
t7.s frwr- 15 ../src/cmd/t7.s t7.s frwr- 14 ../src/cmd/t7.s
t8.s frwr- 15 ../src/cmd/t8.s t8.s frwr- 14 ../src/cmd/t8.s
$ $
tools/fsck7
+2 -2
View File
@@ -213,8 +213,8 @@ sub print_direntry {
# Warn about empty filename # Warn about empty filename
$name= "EMPTY FILENAME" if ($name=~ m{/$}); $name= "EMPTY FILENAME" if ($name=~ m{/$});
printf( "%4d %s%s%s%s%s %2d %3d %5d %s\n", printf( "%4d %s%s%s%s%s %2d %3o %5d %s\n",
$inum, $p1, $p2, $p3, $p4, $p5, $links, $uid, $size, $name ); $inum, $p1, $p2, $p3, $p4, $p5, $links, $uid & 0777, $size, $name );
} }
# Given a directory's i-num and name, check it # Given a directory's i-num and name, check it
tools/mkfs7
+6 -6
View File
@@ -221,7 +221,7 @@ sub fill_inode {
$Block[$blocknum][ $offset + I_FLAGS ] = $flags; $Block[$blocknum][ $offset + I_FLAGS ] = $flags;
dprintf( "Fill inum %d: flags %06o uid %06o size %d (%06o)=> blk %d off %d\n", dprintf( "Fill inum %d: flags %06o uid %06o size %d (%06o)=> blk %d off %d\n",
$inum, $flags, $uid, $size, $size, $blocknum, $offset ); $inum, $flags, $uid & 0777, $size, $size, $blocknum, $offset );
return ($inum); return ($inum);
} }
@@ -369,7 +369,7 @@ sub make_dir {
dprint("Added a .. entry to ourselves\n"); dprint("Added a .. entry to ourselves\n");
} }
} }
dprintf( "Made directory %s perms %06o uid %d in inum %d\n\n", dprintf( "Made directory %s perms %06o uid %06o in inum %d\n\n",
$dirname, $perms, $uid, $inum ); $dirname, $perms, $uid, $inum );
} }
@@ -442,7 +442,7 @@ sub write_file {
# the dirstack. # the dirstack.
sub add_file { sub add_file {
my ( $name, $perms, $uid, $extfile, $inum ) = @_; my ( $name, $perms, $uid, $extfile, $inum ) = @_;
dprintf( "Adding file %s perms %06o uid %d extfile %s\n", dprintf( "Adding file %s perms %06o uid %06o extfile %s\n",
$name, $perms, $uid, $extfile ); $name, $perms, $uid, $extfile );
# Read the file into a buffer # Read the file into a buffer
@@ -543,17 +543,17 @@ sub parse_proto_file {
if ( $type eq I_DIRECTORY ) { if ( $type eq I_DIRECTORY ) {
my ( $name, $permstr, $uid, $inum ) = @words; my ( $name, $permstr, $uid, $inum ) = @words;
make_dir( $name, $perms, $uid, $inum ); make_dir( $name, $perms, oct($uid), $inum );
next; next;
} }
if ( $type eq I_FILE ) { if ( $type eq I_FILE ) {
my ( $name, $permstr, $uid, $extfile, $inum ) = @words; my ( $name, $permstr, $uid, $extfile, $inum ) = @words;
add_file( $name, $perms, $uid, $extfile, $inum ); add_file( $name, $perms, oct($uid), $extfile, $inum );
next; next;
} }
if ( $type eq I_SPECIAL ) { if ( $type eq I_SPECIAL ) {
my ( $name, $permstr, $uid, $inum ) = @words; my ( $name, $permstr, $uid, $inum ) = @words;
add_special( $name, $perms, $uid, $inum ); add_special( $name, $perms, oct($uid), $inum );
next; next;
} }
if ( $type eq I_LINK ) { if ( $type eq I_LINK ) {