Version Control Program and Rolling Backup Utility

Makefile

@@ -103,7 +103,7 @@ $U/usys.o : $U/usys.S
 $U/_forktest: $U/forktest.o $(ULIB)
 	# forktest has less library code linked in - needs to be small
 	# in order to be able to max out the proc table.
-	$(LD) $(LDFLAGS) -N -e main -Ttext 0 -o $U/_forktest $U/forktest.o $U/ulib.o $U/usys.o $U/umalloc.o $U/printf.o
+	$(LD) $(LDFLAGS) -N -e main -Ttext 0 -o $U/_forktest $U/forktest.o $U/ulib.o $U/usys.o $U/umalloc.o
 	$(OBJDUMP) -S $U/_forktest > $U/forktest.asm
 
 mkfs/mkfs: mkfs/mkfs.c $K/fs.h $K/param.h
@@ -130,11 +130,13 @@ UPROGS=\
 	$U/_stressfs\
 	$U/_usertests\
 	$U/_grind\
+	$U/_vcp\
 	$U/_wc\
 	$U/_zombie\
 
-fs.img: mkfs/mkfs README.md $(UPROGS)
-	mkfs/mkfs fs.img README.md $(UPROGS)
+fs.img: mkfs/mkfs README.md getlinetest.txt $(UPROGS)
+	mkfs/mkfs fs.img README.md getlinetest.txt vcpTest.txt $(UPROGS)
+
 
 -include kernel/*.d user/*.d
 

getlinetest.txt

@@ -0,0 +1,13 @@
+# FogOS
+
+Hello world!!
+
+What's going on, class??
+
+How about that fog out there?!
+
+Let's create a REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY long line. IS THAT LONG ENOUGH?!?!?!
+
+Okay all done.
+
+Have a good one!

kernel/fs.h

@@ -51,7 +51,7 @@ struct dinode {
 #define BBLOCK(b, sb) ((b)/BPB + sb.bmapstart)
 
 // Directory is a file containing a sequence of dirent structures.
-#define DIRSIZ 14
+#define DIRSIZ 30
 
 struct dirent {
   ushort inum;

user/user.h

@@ -1,3 +1,16 @@
+#define NULL ((void *) 0)
+
+#define bool _Bool
+#define true 1
+#define false 0
+
+#define SEEK_SET        0
+#define STDIN_FILENO    0
+#define SEEK_CUR        1
+#define STDOUT_FILENO   1
+#define SEEK_END        2
+#define STDERR_FILENO   2
+
 struct stat;
 
 // system calls
@@ -22,6 +35,9 @@ int getpid(void);
 char* sbrk(int);
 int sleep(int);
 int uptime(void);
+int reboot(void);
+int shutdown(void);
+uint64 timestamp(void);
 
 // ulib.c
 int stat(const char*, struct stat*);
@@ -32,8 +48,8 @@ int strcmp(const char*, const char*);
 void fprintf(int, const char*, ...);
 void printf(const char*, ...);
 char* gets(char*, int max);
-int fgets(int fd, char*, int max);
-int getline(char **lineptr, uint *n, int fd);
+int fgets(int fd, char *buf, int max);
+int getline(char **ptr, uint *size, int fd);
 uint strlen(const char*);
 void* memset(void*, int, uint);
 void* malloc(uint);