diff options
| author | Robert Morris <rtm@csail.mit.edu> | 2012-08-28 12:57:05 -0400 | 
|---|---|---|
| committer | Robert Morris <rtm@csail.mit.edu> | 2012-08-28 12:57:05 -0400 | 
| commit | 8960f60b30b69a1f45ffa9d8b2b204714725f1fa (patch) | |
| tree | b0c84ed8f05abe6dad0ad5a97eabe58a0d098c26 | |
| parent | 9d59eb015141697da616a4b98ac27cf4269cd780 (diff) | |
| download | xv6-labs-8960f60b30b69a1f45ffa9d8b2b204714725f1fa.tar.gz xv6-labs-8960f60b30b69a1f45ffa9d8b2b204714725f1fa.tar.bz2 xv6-labs-8960f60b30b69a1f45ffa9d8b2b204714725f1fa.zip | |
junk
| -rw-r--r-- | proc.h | 2 | ||||
| -rw-r--r-- | stat.h | 6 | ||||
| -rw-r--r-- | wc.c | 2 | 
3 files changed, 5 insertions, 5 deletions
| @@ -7,7 +7,7 @@ struct cpu {    struct context *scheduler;   // swtch() here to enter scheduler    struct taskstate ts;         // Used by x86 to find stack for interrupt    struct segdesc gdt[NSEGS];   // x86 global descriptor table -  volatile uint started;        // Has the CPU started? +  volatile uint started;       // Has the CPU started?    int ncli;                    // Depth of pushcli nesting.    int intena;                  // Were interrupts enabled before pushcli? @@ -1,11 +1,11 @@  #define T_DIR  1   // Directory  #define T_FILE 2   // File -#define T_DEV  3   // Special device +#define T_DEV  3   // Device  struct stat {    short type;  // Type of file -  int dev;     // Device number -  uint ino;    // Inode number on device +  int dev;     // File system's disk device +  uint ino;    // Inode number    short nlink; // Number of links to file    uint size;   // Size of file in bytes  }; @@ -44,7 +44,7 @@ main(int argc, char *argv[])    for(i = 1; i < argc; i++){      if((fd = open(argv[i], 0)) < 0){ -      printf(1, "cat: cannot open %s\n", argv[i]); +      printf(1, "wc: cannot open %s\n", argv[i]);        exit();      }      wc(fd, argv[i]); | 
