Browse Source

Adding paqfs and moving pic to APEX due to dependencies

Signed-off-by: Álvaro Jurado <elbingmiss@gmail.com>
Álvaro Jurado 6 years ago
parent
commit
6dff245d3e

+ 1 - 0
sys/src/cmd/build.json

@@ -53,6 +53,7 @@
 			"ndb/ndb.json",
 			"newfs/",
 			"page/build.json",
+			"paqfs/build.json",
 			"plot/build.json",
 			"plumb/plumb.json",
 			"plumb/plumber.json",

+ 11 - 0
sys/src/cmd/paqfs/build.json

@@ -0,0 +1,11 @@
+{
+	"paqfs": {
+		"Include": [
+			"../cmd.json"
+		],
+		"Install": "/$ARCH/bin",
+		"SourceFilesCmd": [
+			"*.c"
+		]
+	}
+}

+ 0 - 24
sys/src/cmd/paqfs/mkfile

@@ -1,24 +0,0 @@
-</$objtype/mkfile
-
-HFILES=paqfs.h
-
-TARG=mkpaqfs\
-	paqfs\
-
-OFILES=
-
-PROGS=${TARG:%=$O.%}
-
-BIN=/$objtype/bin
-UPDATE=\
-	mkfile\
-	$HFILES\
-	${OFILES:%.$O=%.c}\
-	${TARG:%=%.c}\
-	${TARG:%=/386/bin/%}\
-
-
-all:V:
-
-< /sys/src/cmd/mkmany
-

+ 3 - 3
sys/src/cmd/paqfs/paqfs.c

@@ -261,14 +261,14 @@ main(int argc, char *argv[])
 		break;
 	default:
 		close(pfd[1]);	/* don't deadlock if child fails */
-		if(mnt && mount(pfd[0], -1, mntpoint, MREPL|MCREATE, "") < 0)
+		if(mnt && (mount(pfd[0], -1, mntpoint, MREPL|MCREATE, "", 'M') < 0))
 			sysfatal("mount %s: %r", mntpoint);
 	}
 	exits(0);
 }
 
 char*
-rversion(Fid*)
+rversion(Fid *fid)
 {
 	Fid *f;
 
@@ -286,7 +286,7 @@ rversion(Fid*)
 }
 
 char*
-rauth(Fid*)
+rauth(Fid *f)
 {
 	return Enoauth;
 }

+ 4 - 4
sys/src/cmd/paqfs/paqfs.h

@@ -43,7 +43,7 @@ enum {
 struct PaqHeader
 {
 	uint32_t	magic;
-	ushort	version;
+	uint16_t	version;
 	uint32_t	blocksize;
 	uint32_t	time;
 	char	label[32];
@@ -53,8 +53,8 @@ struct PaqBlock
 {
 	uint32_t	magic;
 	uint32_t	size;		/* data size - always <= blocksize */
-	uchar	type;
-	uchar	encoding;
+	uint8_t	type;
+	uint8_t	encoding;
 	uint32_t	adler32;	/* applied to unencoded data */
 };
 
@@ -62,7 +62,7 @@ struct PaqTrailer
 {
 	uint32_t	magic;
 	uint32_t	root;
-	uchar	sha1[20];
+	uint8_t	sha1[20];
 };
 
 struct PaqDir