Remove puts in favor of printf.

Allow multiple arguments to ls.

Remove puts in favor of printf.
1b789e1d · rsc · 8e88f9e2 · 1b789e1d · 1b789e1d · 1b789e1d
--- a/cat.c
+++ b/cat.c
@@ -2,19 +2,17 @@
 #include "stat.h"
 #include "user.h"
-char buf[513];
+char buf[512];
 void
 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();
  }
 }
@@ -26,19 +24,16 @@ main(int argc, char *argv[])
  if(argc <= 1) {
    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();
 }
--- a/echo.c
+++ b/echo.c
@@ -7,10 +7,7 @@ main(int argc, char *argv[])
 {
  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();
 }
--- a/init.c
+++ b/init.c
@@ -21,18 +21,18 @@ main(void)
  dup(0);  // stderr
  for(;;){
-    puts("init: starting sh\n");
+    printf(1, "init: starting sh\n");
    pid = fork();
    if(pid < 0){
-      puts("init: fork failed\n");
+      printf(1, "init: fork failed\n");
      exit();
    }
    if(pid == 0){
      exec("sh", sh_args);
-      puts("init: exec sh failed\n");
+      printf(1, "init: exec sh failed\n");
      exit();
    }
    while((wpid=wait()) >= 0 && wpid != pid)
-      puts("zombie!\n");
+      printf(1, "zombie!\n");
  }
 }
--- a/ls.c
+++ b/ls.c
@@ -3,83 +3,83 @@
 #include "user.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++) {
-      printf(1, "%c", n[i]);
+  // Find first character after last slash.
-  }
+  for(p=path+strlen(path); p >= path && *p != '/'; p--)
-  for(; i < DIRSIZ; i++)
+    ;
-    printf(1, " ");
+  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;
 }
-int
+void
-main(int argc, char *argv[])
+ls(char *path)
 {
  char buf[512], *p;
  int fd;
-  uint off, sz;
  struct dirent de;
  struct stat st;
-  if(argc > 2){
+  if((fd = open(path, 0)) < 0){
-    puts("Usage: ls [dir]\n");
+    printf(2, "ls: cannot open %s\n", path);
-    exit();
+    return;
  }
-  if(argc == 2) {
+  if(fstat(fd, &st) < 0){
-    fd = open(argv[1], 0);
+    printf(2, "ls: cannot stat %s\n", path);
-    if(fd < 0){
+    close(fd);
-      printf(2, "ls: cannot open %s\n", argv[1]);
+    return;
-      exit();
-    }
-  } else {
-    fd = open(".", 0);
-    if(fd < 0){
-      printf(2, "ls: cannot open .\n");
-      exit();
-    }
  }
-  if(fstat(fd, &st) < 0) {
+  switch(st.type){
-    printf(2, "ls: cannot stat dir\n");
-    exit();
-  }
-  switch(st.type) {
  case T_FILE:
-    pname(argv[1]);
+    printf(1, "%s %d %d %d\n", fmtname(path), st.type, st.ino, st.size);
-    printf(1, "%d %d %d\n", st.type, st.ino, st.size);
    break;
  case T_DIR:
-    sz = st.size;
+    if(strlen(path) + 1 + DIRSIZ + 1 > sizeof buf){
-    for(off = 0; off < sz; off += sizeof(de)) {
+      printf(1, "ls: path too long\n");
-      if(read(fd, &de, sizeof(de)) != sizeof(de)) {
+      break;
-        printf(1, "ls: read error\n");
+    }
-        break;
+    strcpy(buf, path);
-      }
+    p = buf+strlen(buf);
-      if(de.inum != 0) {
+    *p++ = '/';
-        p = buf;
+    while(read(fd, &de, sizeof(de)) == sizeof(de)){
-        if(argc == 2) {			  
+      if(de.inum == 0)
-          strcpy(p, argv[1]);
+        continue;
-          p += strlen(p);
+      memmove(p, de.name, DIRSIZ);
-          if(*(p-1) != '/')
+      p[DIRSIZ] = 0;
-            *p++ = '/';
+      if(stat(buf, &st) < 0){
-        }
+        printf(1, "ls: cannot stat %s\n", buf);
-        memmove(p, de.name, DIRSIZ);
+        continue;
-        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);
      }
+      printf(1, "%s %d %d %d\n", fmtname(buf), st.type, st.ino, st.size);
    }
    break;
  }
  close(fd);
+}
+int
+main(int argc, char *argv[])
+{
+  int i;
+  if(argc < 2){
+    ls(".");
+    exit();
+  }
+  for(i=1; i<argc; i++)
+    ls(argv[i]);
  exit();
 }
--- a/sh.c
+++ b/sh.c
@@ -51,7 +51,7 @@ main(void)
 int
 getcmd(char *buf, int nbuf)
 {
-  puts("$ ");
+  printf(2, "$ ");
  memset(buf, 0, nbuf);
  gets(buf, nbuf);
  if(buf[0] == 0) // EOF

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

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