- Added non-complete fileserver implementation(myfs.b);

- Made modules appropriate to be used from fileserver;
- Made some stylistic changes;

Author: Manzur

cat-file.b

@@ -3,8 +3,6 @@ implement Catfile;
 include "sys.m";
 	sys: Sys;
 
-include "draw.m";
-
 include "tables.m";
 	tables: Tables;
 Strhash: import tables;	
@@ -16,49 +14,36 @@ Iobuf: import bufio;
 include "utils.m";
 	utils: Utils;
 
-include "arg.m";
-	arg: Arg;
-
-Catfile: module
-{
-	init: fn(nil: ref Draw->Context, args: list of string);
-};
+include "cat-file.m";
 
+msgchan: chan of array of byte;
 printtypeonly := 0;
+REPOPATH: string;
 
-init(nil: ref Draw->Context, args: list of string)
+init(repopath: string, typeonly: int, path: string, ch: chan of array of byte)
 {
 	sys = load Sys Sys->PATH;
-	if(len args < 2)
-		usage();
 	utils = load Utils Utils->PATH;
-	arg   = load Arg Arg->PATH;
-	utils->init();
-	arg->init(args);
-	while((c := arg->opt()) != 0)
-	{
-		case c
-		{
-			't' => printtypeonly = 1;
-			* => usage();return;
-		}
-	}
-	catfile(hd arg->argv());
-}
 
+	REPOPATH = repopath;
+	utils->init(repopath);
+       
+	printtypeonly = typeonly;
+	msgchan = ch;
+	catfile(path);
+}
 
 catfile(path: string)
 {
 	(filetype, filesize, buf) := utils->readsha1file(path);	
 	offset := 0;
-	sys->print("filetype: %s\n", filetype);
-	if(printtypeonly)
+
+	msgchan <-= sys->aprint("filetype: %s\n", filetype);
+	if(printtypeonly){
+		msgchan <-= nil;
 		return;
-	while(offset < len buf)
-	{
-		cnt := sys->write(sys->fildes(1), buf[offset:], len buf - offset);
-		offset += cnt;
 	}
+	msgchan <-= buf[offset:];
 }
 
 usage()

cat-file.m

@@ -0,0 +1,5 @@
+Catfile: module
+{
+	PATH: con "/dis/git/cat-file.dis";
+	init: fn(repopath: string, printtypeonly: int, path: string, ch: chan of array of byte);
+};

checkout-index.b

@@ -1,10 +1,10 @@
 implement Checkoutindex;
 
+include "checkout-index.m";
+
 include "sys.m";
 	sys: Sys;
 
-include "draw.m";	
-
 include "tables.m";
 	tables: Tables;
 Strhash: import tables;
@@ -24,28 +24,26 @@ INDEXPATH, sha2string,string2path, readsha1file: import utils;
 include "arg.m";
 	arg: Arg;
 
-Checkoutindex: module
-{
-	init: fn(nil: ref Draw->Context, args: list of string);
-};
-
-
 index: ref Index;
 stderr: ref Sys->FD;
 all: int = 0;
 force: int = 0;
+REPOPATH: string;
 
-init(nil: ref Draw->Context, args: list of string)
+init(args: list of string)
 {
 	sys = load Sys Sys->PATH;
 	arg = load Arg Arg->PATH;
 	gitindex = load Gitindex Gitindex->PATH;
 	tables = load Tables Tables->PATH;
 	utils = load Utils Utils->PATH;
-	utils->init();
-	index = Index.new();
+
+	REPOPATH = hd args;
+	args = tl args;
+	utils->init(REPOPATH);
+	index = Index.new(REPOPATH);
 	stderr = sys->fildes(2);
-	if(!index.readindex(INDEXPATH))
+	if(!index.readindex(REPOPATH + INDEXPATH))
 	{
 		sys->fprint(stderr, "index read error\n");
 		exit;
@@ -77,29 +75,25 @@ init(nil: ref Draw->Context, args: list of string)
 
 checkoutfile(path: string)
 {
+	fullpath := REPOPATH + path;
 	entry := index.entries.find(path);
-	if(entry == nil)
-	{
+	if(entry == nil){
 		sys->print("No such file: %s\n", path);
 		return;
 	}
 	#if file exists and force flag is off
-	if(!force && sys->open(path, Sys->OREAD) != nil)
-	{
+	if(!force && sys->open(fullpath, Sys->OREAD) != nil){
 		sys->fprint(stderr, "file(%s) exists\n", path);
 		return;
 	}
-	fd := sys->create(path, Sys->OWRITE, 8r644);
-	if(fd == nil)
-	{
-		makedirs(dirname(path));
-		fd = sys->create(path,Sys->OWRITE, 8r644);
-		if(fd == nil)
-		{
+	fd := sys->create(fullpath, Sys->OWRITE, 8r644);
+	if(fd == nil){
+		makedirs(dirname(fullpath));
+		fd = sys->create(fullpath, Sys->OWRITE, 8r644);
+		if(fd == nil){
 			sys->fprint(stderr, "file(%s) couldn't be created\n", path);
 			return;
 		}
-
 	}
 	checkoutentry(fd, entry);
 }
@@ -108,15 +102,13 @@ checkoutentry(fd: ref Sys->FD, entry: ref Entry)
 {
 	(filetype, filesize, buf) := readsha1file(sha2string(entry.sha1));
 	sys->print("filetype: %s; filesize: %d\n", filetype, filesize);
-	if(sys->write(fd, buf, len buf) != len buf)
-	{
+	if(sys->write(fd, buf, len buf) != len buf){
 		sys->fprint(stderr, "error occured while writing to file: %r\n");
 		return;
 	}
 	dirstat := sys->nulldir;
 	dirstat.mode = entry.mode & 1023;
-	if(sys->fwstat(fd, dirstat))
-	{
+	if(sys->fwstat(fd, dirstat)){
 		sys->fprint(stderr, "stat can't be changed: %r\n");
 		return;
 	}
@@ -126,29 +118,22 @@ checkoutentry(fd: ref Sys->FD, entry: ref Entry)
 checkoutall()
 {
 	for(l := index.entries.all(); l != nil; l = tl l)
-	{
 		checkoutfile((hd l).name);
-	}
 }
 
 dirname(path: string): string
 {
-	for(i := len path - 1; i >= 0; i--)
-	{
+	for(i := len path - 1; i >= 0; i--){
 		if(path[i] == '/')
-		{
 			return path[0:i];
-		}
 	}
 	return ".";
 }
 
 makedirs(path: string)
 {
 	if(!exists(path))
-	{
 		makedirs(dirname(path));
-	}
 	sys->create(path, Sys->OREAD,  Sys->DMDIR|8r755);
 }
 

checkout-index.m

@@ -0,0 +1,7 @@
+
+Checkoutindex: module
+{
+	init: fn(args: list of string);
+};
+
+

checkrepo.b

@@ -1,10 +1,10 @@
 implement Checkrepo;
 
+include "checkrepo.m";
+
 include "sys.m";
 	sys: Sys;
 
-include "draw.m";
-
 include "tables.m";
 Strhash: import Tables;
 
@@ -16,18 +16,12 @@ include "utils.m";
 	utils: Utils;
 SHALEN, readsha1file, isdir, sha2string, OBJECTSTOREPATH: import utils;
 
-
 include "readdir.m";
 	readdir: Readdir;
 
 include "string.m";
 	stringmodule: String;
 
-Checkrepo: module
-{
-	init: fn(nil: ref Draw->Context, args: list of string);
-};
-
 Object: adt
 {
 	name: string;
@@ -44,15 +38,18 @@ objects := array[HASHSZ] of list of ref Object;
 
 checkvalidness: int;
 stderr: ref Sys->FD;
+REPOPATH: string;
 
-init(nil: ref Draw->Context, args: list of string)
+init(args: list of string)
 {
 	sys = load Sys Sys->PATH;
 	utils = load Utils Utils->PATH;
 	bufio = load Bufio Bufio->PATH;
 	readdir = load Readdir Readdir->PATH;
 	stringmodule = load String String->PATH;
-	utils->init();
+
+	REPOPATH = hd args;
+	utils->init(REPOPATH);
 	stderr = sys->fildes(2);
 	check();
 }
@@ -62,7 +59,6 @@ check()
 	readrepo(OBJECTSTOREPATH);
 
 	cnt := 0;
-
 	for(i := 0; i < HASHSZ; i++){
 		cnt += len objects[i];
 		for(l := objects[i]; l != nil; l = tl l){

checkrepo.m

@@ -0,0 +1,5 @@
+Checkrepo: module
+{
+	init: fn(args: list of string);
+};
+

commit-tree.b

@@ -1,10 +1,10 @@
 implement Committree;
 
+include "commit-tree.m";
+
 include "sys.m";
 	sys: Sys;
 
-include "draw.m";
-
 include "arg.m";
 	arg: Arg;
 
@@ -33,15 +33,10 @@ include "env.m";
 	env: Env;
 
 stderr: ref Sys->FD;
-
-Committree: module
-{
-	init: fn(nil: ref Draw->Context, args: list of string);
-};
-
+REPOPATH: string;
 
 
-init(nil: ref Draw->Context, args: list of string)
+init(args: list of string)
 {
 	sys = load Sys Sys->PATH;
 	arg = load Arg Arg->PATH;
@@ -57,11 +52,14 @@ init(nil: ref Draw->Context, args: list of string)
 	if(len args < 2)
 	{
 		usage();
-		return;
+		exit;
 	}
+
+	REPOPATH = hd args;
+	args = tl args;
 
 	arg->init(args);
-	utils->init();
+	utils->init(REPOPATH);
 	deflate->init();
 
 	parents: list of string = nil;
@@ -82,24 +80,21 @@ init(nil: ref Draw->Context, args: list of string)
 
 commit(treesha: string, parents: list of string): string
 {
-	if(!utils->exists(treesha))
-	{
+	if(!utils->exists(treesha)){
 		sys->fprint(stderr, "no such tree file\n");
 		return "";
 	}
 
-	for(l := parents; l != nil; l = tl l)
-	{
+	for(l := parents; l != nil; l = tl l){
 		if(!utils->exists(hd l)){
 			sys->fprint(stderr, "no such sha file: %s\n", hd l);
 			return "";
 		}
-
 	}
+
 	commitmsg := "";
 	commitmsg += "tree " + treesha + "\n";
-	while(parents != nil)
-	{
+	while(parents != nil){
 		commitmsg += "parent " + (hd parents) + "\n";
 		parents = tl parents;
 	}
@@ -128,7 +123,7 @@ commit(treesha: string, parents: list of string): string
 	#6 - "commit", 1 - " ", 1 - '\0'
 	buf := array[6 + 1 + len commitlen + 1 + len commitmsg] of byte;
 
-	buf[:] = array of byte ("commit " + int2string(len commitmsg));
+	buf[:] = sys->aprint("commit %d", len commitmsg);
 	buf[7 + len commitlen] = byte 0;
 	buf[7 + len commitlen + 1:] = array of byte commitmsg;
 
@@ -142,8 +137,9 @@ commit(treesha: string, parents: list of string): string
 	ch <-= (0, buf);
 	(sz, sha) = <-ch;
 
+	fd := sys->open(REPOPATH + "head", Sys->OWRITE);
+	sys->fprint(fd, "%s", treesha);
 	return sha2string(sha);
-
 }
 
 

commit-tree.m

@@ -0,0 +1,5 @@
+
+Committree: module
+{
+	init: fn(args: list of string);
+};