diff options
| author | Petter Rodhelind <petter.rodhelind@gmail.com> | 2020-01-14 11:41:08 +0100 |
|---|---|---|
| committer | Petter Rodhelind <petter.rodhelind@gmail.com> | 2020-01-14 11:41:08 +0100 |
| commit | 02d7aa8915f9c3a3288dab01f321eb94ba219e3b (patch) | |
| tree | f053238978479e408a2b83571443e132f30586ab /src/cmd/tapefs | |
| parent | c0c9d8f883dfd3a7f5a74499d91bb95884b15873 (diff) | |
| parent | 3d1382b98a502d0c34d5ba2c462396acc515016e (diff) | |
| download | plan9port-02d7aa8915f9c3a3288dab01f321eb94ba219e3b.tar.gz plan9port-02d7aa8915f9c3a3288dab01f321eb94ba219e3b.tar.bz2 plan9port-02d7aa8915f9c3a3288dab01f321eb94ba219e3b.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/cmd/tapefs')
| -rw-r--r-- | src/cmd/tapefs/32vfs.c | 2 | ||||
| -rw-r--r-- | src/cmd/tapefs/util.c | 2 | ||||
| -rw-r--r-- | src/cmd/tapefs/v10fs.c | 2 | ||||
| -rw-r--r-- | src/cmd/tapefs/v6fs.c | 2 | ||||
| -rw-r--r-- | src/cmd/tapefs/zipfs.c | 3 |
5 files changed, 5 insertions, 6 deletions
diff --git a/src/cmd/tapefs/32vfs.c b/src/cmd/tapefs/32vfs.c index 1d917f82..af5f5200 100644 --- a/src/cmd/tapefs/32vfs.c +++ b/src/cmd/tapefs/32vfs.c @@ -177,7 +177,7 @@ iget(int ino) if ((flags&VFMT)==VIFDIR) f.mode |= DMDIR; f.uid = g2byte(dp->uid); - f.gid = g2byte(dp->gid); + f.gid = g2byte(dp->gid); f.mdate = g4byte(dp->mtime); return f; } diff --git a/src/cmd/tapefs/util.c b/src/cmd/tapefs/util.c index 199235f3..a166dcd0 100644 --- a/src/cmd/tapefs/util.c +++ b/src/cmd/tapefs/util.c @@ -34,7 +34,7 @@ getpass(char *file) up[nid].id = atoi(line[2]); up[nid].name = strdup(line[0]); nid++; - } + } Bterm(bp); up[nid].name = 0; return up; diff --git a/src/cmd/tapefs/v10fs.c b/src/cmd/tapefs/v10fs.c index c2875b84..0b695dba 100644 --- a/src/cmd/tapefs/v10fs.c +++ b/src/cmd/tapefs/v10fs.c @@ -168,7 +168,7 @@ iget(int ino) if ((flags&VFMT)==VIFDIR) f.mode |= DMDIR; f.uid = g2byte(dp->uid); - f.gid = g2byte(dp->gid); + f.gid = g2byte(dp->gid); f.mdate = g4byte(dp->mtime); return f; } diff --git a/src/cmd/tapefs/v6fs.c b/src/cmd/tapefs/v6fs.c index 74c6737c..43de410c 100644 --- a/src/cmd/tapefs/v6fs.c +++ b/src/cmd/tapefs/v6fs.c @@ -169,7 +169,7 @@ iget(int ino) if ((flags&V6FMT)==V6IFDIR) f.mode |= DMDIR; f.uid = dp->uid; - f.gid = dp->gid; + f.gid = dp->gid; f.mdate = (dp->mtime[2]<<0) + (dp->mtime[3]<<8) +(dp->mtime[0]<<16) + (dp->mtime[1]<<24); return f; diff --git a/src/cmd/tapefs/zipfs.c b/src/cmd/tapefs/zipfs.c index e9354f7b..8725e0c9 100644 --- a/src/cmd/tapefs/zipfs.c +++ b/src/cmd/tapefs/zipfs.c @@ -154,7 +154,7 @@ doread(Ram *r, vlong off, long cnt) sysfatal("%d - unsupported compression method", zh.meth); break; } - + return buf; } @@ -382,4 +382,3 @@ msdos2time(int time, int date) return tm2sec(&tm); } - |