This commit is contained in:
Robert Morris 2012-08-28 12:57:05 -04:00
parent 9d59eb0151
commit 8960f60b30
3 changed files with 5 additions and 5 deletions

2
proc.h
View File

@ -7,7 +7,7 @@ struct cpu {
struct context *scheduler; // swtch() here to enter scheduler struct context *scheduler; // swtch() here to enter scheduler
struct taskstate ts; // Used by x86 to find stack for interrupt struct taskstate ts; // Used by x86 to find stack for interrupt
struct segdesc gdt[NSEGS]; // x86 global descriptor table 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 ncli; // Depth of pushcli nesting.
int intena; // Were interrupts enabled before pushcli? int intena; // Were interrupts enabled before pushcli?

6
stat.h
View File

@ -1,11 +1,11 @@
#define T_DIR 1 // Directory #define T_DIR 1 // Directory
#define T_FILE 2 // File #define T_FILE 2 // File
#define T_DEV 3 // Special device #define T_DEV 3 // Device
struct stat { struct stat {
short type; // Type of file short type; // Type of file
int dev; // Device number int dev; // File system's disk device
uint ino; // Inode number on device uint ino; // Inode number
short nlink; // Number of links to file short nlink; // Number of links to file
uint size; // Size of file in bytes uint size; // Size of file in bytes
}; };

2
wc.c
View File

@ -44,7 +44,7 @@ main(int argc, char *argv[])
for(i = 1; i < argc; i++){ for(i = 1; i < argc; i++){
if((fd = open(argv[i], 0)) < 0){ 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(); exit();
} }
wc(fd, argv[i]); wc(fd, argv[i]);