Remove puts in favor of printf.

Allow multiple arguments to ls.
This commit is contained in:
rsc 2007-08-24 20:03:40 +00:00
parent 8e88f9e2c6
commit 1b789e1d50
7 changed files with 89 additions and 104 deletions

35
cat.c
View file

@ -2,19 +2,17 @@
#include "stat.h" #include "stat.h"
#include "user.h" #include "user.h"
char buf[513]; char buf[512];
void void
rfile(int fd) rfile(int fd)
{ {
int cc; int n;
while((cc = read(fd, buf, sizeof(buf) - 1)) > 0){ while((n = read(fd, buf, sizeof(buf))) > 0)
buf[cc] = '\0'; write(1, buf, n);
puts(buf); if(n < 0){
} printf(1, "cat: read error\n");
if(cc < 0){
puts("cat: read error\n");
exit(); exit();
} }
} }
@ -26,19 +24,16 @@ main(int argc, char *argv[])
if(argc <= 1) { if(argc <= 1) {
rfile(0); rfile(0);
} else { exit();
for(i = 1; i < argc; i++){
fd = open(argv[i], 0);
if(fd < 0){
puts("cat: cannot open ");
puts(argv[i]);
puts("\n");
exit();
}
rfile(fd);
close(fd);
}
} }
for(i = 1; i < argc; i++){
if((fd = open(argv[i], 0)) < 0){
printf(1, "cat: cannot open %s\n", argv[i]);
exit();
}
rfile(fd);
close(fd);
}
exit(); exit();
} }

7
echo.c
View file

@ -7,10 +7,7 @@ main(int argc, char *argv[])
{ {
int i; int i;
for(i = 1; i < argc; i++){ for(i = 1; i < argc; i++)
puts(argv[i]); printf(1, "%s%s", argv[i], i+1 < argc ? " " : "\n");
puts(" ");
}
puts("\n");
exit(); exit();
} }

8
init.c
View file

@ -21,18 +21,18 @@ main(void)
dup(0); // stderr dup(0); // stderr
for(;;){ for(;;){
puts("init: starting sh\n"); printf(1, "init: starting sh\n");
pid = fork(); pid = fork();
if(pid < 0){ if(pid < 0){
puts("init: fork failed\n"); printf(1, "init: fork failed\n");
exit(); exit();
} }
if(pid == 0){ if(pid == 0){
exec("sh", sh_args); exec("sh", sh_args);
puts("init: exec sh failed\n"); printf(1, "init: exec sh failed\n");
exit(); exit();
} }
while((wpid=wait()) >= 0 && wpid != pid) while((wpid=wait()) >= 0 && wpid != pid)
puts("zombie!\n"); printf(1, "zombie!\n");
} }
} }

134
ls.c
View file

@ -3,83 +3,83 @@
#include "user.h" #include "user.h"
#include "fs.h" #include "fs.h"
void char*
pname(char *n) fmtname(char *path)
{ {
int i; static char buf[DIRSIZ+1];
char *p;
for(i = 0; (i < DIRSIZ) && (n[i] != '\0') ; i++) { // Find first character after last slash.
printf(1, "%c", n[i]); for(p=path+strlen(path); p >= path && *p != '/'; p--)
;
p++;
// Return blank-padded name.
if(strlen(p) >= DIRSIZ)
return p;
memmove(buf, p, strlen(p));
memset(buf+strlen(p), ' ', DIRSIZ-strlen(p));
return buf;
}
void
ls(char *path)
{
char buf[512], *p;
int fd;
struct dirent de;
struct stat st;
if((fd = open(path, 0)) < 0){
printf(2, "ls: cannot open %s\n", path);
return;
} }
for(; i < DIRSIZ; i++)
printf(1, " "); if(fstat(fd, &st) < 0){
printf(2, "ls: cannot stat %s\n", path);
close(fd);
return;
}
switch(st.type){
case T_FILE:
printf(1, "%s %d %d %d\n", fmtname(path), st.type, st.ino, st.size);
break;
case T_DIR:
if(strlen(path) + 1 + DIRSIZ + 1 > sizeof buf){
printf(1, "ls: path too long\n");
break;
}
strcpy(buf, path);
p = buf+strlen(buf);
*p++ = '/';
while(read(fd, &de, sizeof(de)) == sizeof(de)){
if(de.inum == 0)
continue;
memmove(p, de.name, DIRSIZ);
p[DIRSIZ] = 0;
if(stat(buf, &st) < 0){
printf(1, "ls: cannot stat %s\n", buf);
continue;
}
printf(1, "%s %d %d %d\n", fmtname(buf), st.type, st.ino, st.size);
}
break;
}
close(fd);
} }
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
char buf[512], *p; int i;
int fd;
uint off, sz;
struct dirent de;
struct stat st;
if(argc > 2){ if(argc < 2){
puts("Usage: ls [dir]\n"); ls(".");
exit(); exit();
} }
for(i=1; i<argc; i++)
if(argc == 2) { ls(argv[i]);
fd = open(argv[1], 0);
if(fd < 0){
printf(2, "ls: cannot open %s\n", argv[1]);
exit();
}
} else {
fd = open(".", 0);
if(fd < 0){
printf(2, "ls: cannot open .\n");
exit();
}
}
if(fstat(fd, &st) < 0) {
printf(2, "ls: cannot stat dir\n");
exit();
}
switch(st.type) {
case T_FILE:
pname(argv[1]);
printf(1, "%d %d %d\n", st.type, st.ino, st.size);
break;
case T_DIR:
sz = st.size;
for(off = 0; off < sz; off += sizeof(de)) {
if(read(fd, &de, sizeof(de)) != sizeof(de)) {
printf(1, "ls: read error\n");
break;
}
if(de.inum != 0) {
p = buf;
if(argc == 2) {
strcpy(p, argv[1]);
p += strlen(p);
if(*(p-1) != '/')
*p++ = '/';
}
memmove(p, de.name, DIRSIZ);
p[DIRSIZ] = 0;
if(stat(buf, &st) < 0) {
printf(1, "stat: failed %s\n", de.name);
continue;
}
pname(de.name);
printf(1, "%d %d %d\n", st.type, de.inum, st.size);
}
}
break;
}
close(fd);
exit(); exit();
} }

2
sh.c
View file

@ -51,7 +51,7 @@ main(void)
int int
getcmd(char *buf, int nbuf) getcmd(char *buf, int nbuf)
{ {
puts("$ "); printf(2, "$ ");
memset(buf, 0, nbuf); memset(buf, 0, nbuf);
gets(buf, nbuf); gets(buf, nbuf);
if(buf[0] == 0) // EOF if(buf[0] == 0) // EOF

6
ulib.c
View file

@ -3,12 +3,6 @@
#include "fcntl.h" #include "fcntl.h"
#include "user.h" #include "user.h"
int
puts(char *s)
{
return write(1, s, strlen(s));
}
char* char*
strcpy(char *s, char *t) strcpy(char *s, char *t)
{ {

1
user.h
View file

@ -21,7 +21,6 @@ char* sbrk(int);
// ulib.c // ulib.c
int stat(char*, struct stat*); int stat(char*, struct stat*);
int puts(char*);
char* strcpy(char*, char*); char* strcpy(char*, char*);
void *memmove(void*, void*, int); void *memmove(void*, void*, int);
char* strchr(const char*, char c); char* strchr(const char*, char c);