--

Author: yasui0906

Makefile

@@ -1,33 +1,32 @@
-all: lib mtnd fuse tool test
+all: lib mtnd mtnfs tool test
+
+lib: libmtn.c libmtn.h
+	gcc -c -Wall libmtn.c
+	ar r libmtn.a libmtn.o
 
 mtnd: mtnd.c lib
-	gcc -DMODULE_NAME=\"mtnd\" -o mtnd mtnd.c libmtnfs.a
+	gcc -DMODULE_NAME=\"mtnd\" -o mtnd -Wall mtnd.c common.c libmtn.a
 
-fuse: mtnmount.c lib
-	gcc -DMODULE_NAME=\"mtnmount\" -lfuse -o mtnmount mtnmount.c libmtnfs.a -I/usr/klab/app/fuse/include -L/usr/klab/app/fuse/lib
+mtnfs: mtnfs.c lib
+	gcc -DMODULE_NAME=\"mtnfs\" -o mtnfs -Wall -l fuse mtnfs.c common.c libmtn.a -I. -I/usr/klab/app/fuse/include -L/usr/klab/app/fuse/lib
 
 tool: mtntool.c lib
-	gcc -DMODULE_NAME=\"mtntool\" -o mtntool mtntool.c libmtnfs.a
-
-lib: libmtnfs.c common.c mtnfs.h common.h
-	gcc -c common.c
-	gcc -c libmtnfs.c
-	ar r libmtnfs.a libmtnfs.o common.o
+	gcc -DMODULE_NAME=\"mtntool\" -o mtntool -I. mtntool.c libmtn.a
 
 test: mtntest.c mtnd fuse
-	gcc -DMODULE_NAME=\"mtntest\" -o mtntest mtntest.c libmtnfs.a
+	gcc -DMODULE_NAME=\"mtntest\" -o mtntest -I. mtntest.c libmtn.a
 
 clean:
-	rm -f mtnd mtntool mtnmount libmtnfs.a mtntest *.o
+	rm -f libmtn.a mtnd mtnfs mtntool mtntest *.o
 
 sync:
 	rsync -a *.c *.h Makefile adc:LOCAL/mtnfs/
 	ssh adc "cd LOCAL/mtnfs/;make"
 
 install:
-	rsync -a mtnd     /usr/klab/sbin/mtnd
-	rsync -a mtnmount /usr/klab/sbin/mtnmount
-	rsync -a mtntool  /usr/klab/sbin/mtntool
-	chown root:root   /usr/klab/sbin/mtnd
-	chown root:root   /usr/klab/sbin/mtnmount
-	chown root:root   /usr/klab/sbin/mtntool
+	rsync -a mtnd    /usr/klab/sbin/mtnd
+	rsync -a mtnfs   /usr/klab/sbin/mtnfs
+	rsync -a mtntool /usr/klab/sbin/mtntool
+	chown root:root  /usr/klab/sbin/mtnd
+	chown root:root  /usr/klab/sbin/mtnfs
+	chown root:root  /usr/klab/sbin/mtntool

common.c

@@ -0,0 +1,92 @@
+/*
+ * common.c
+ * Copyright (C) 2011 KLab Inc.
+ */
+#define _GNU_SOURCE
+#define _FILE_OFFSET_BITS 64
+#include "mtn.h"
+#include "libmtn.h"
+#include "common.h"
+
+void dirbase(const char *path, char *d, char *f)
+{
+  char b[PATH_MAX];
+	if(d){
+		strcpy(b, path);
+		strcpy(d, dirname(b));
+	}
+	if(f){
+		strcpy(b, path);
+		strcpy(f, basename(b));
+	}
+}
+
+int mkpidfile(char *path)
+{
+  FILE *fd;
+  if(strlen(path)){
+    if((fd = fopen(path, "w"))){
+      fprintf(fd, "%d\n", getpid());
+      fclose(fd);
+    }else{
+      mtnlogger(NULL, 0, "[error] %s: %s %s\n", __func__, strerror(errno), path);
+      return(1);
+    }
+  }
+  return(0);
+}
+
+int rmpidfile(char *pidfile)
+{
+  if(strlen(pidfile)){
+    unlink(pidfile);
+  }
+  return(0);
+}
+
+uint64_t atoikmg(char *str)
+{
+  int unit = 1;
+  uint64_t val;
+  char buff[1024];
+  char *p = buff;
+  strcpy(buff, str);
+  while(*p){
+    if((*p >= '0') && (*p <= '9')){
+      p++;
+      continue;
+    }
+    switch(*p){
+      case 'K':
+        unit = 1024;
+        break;
+      case 'M':
+        unit = 1024 * 1024;
+        break;
+      case 'G':
+        unit = 1024 * 1024 * 1024;
+        break;
+    }
+    *p = 0;
+  }
+  val = atoi(buff);
+  return(val * unit);
+}
+
+int mkdir_ex(const char *path)
+{
+  struct stat st;
+  char d[PATH_MAX];
+  char f[PATH_MAX];
+  dirbase(path,d,f);
+  if(stat(path, &st) == 0){
+    return(0);
+  }
+  if(stat(d, &st) == -1){
+    if(mkdir_ex(d) == -1){
+      return(-1);
+    }
+  }
+  return(mkdir(path, 0755));
+}
+

common.h

@@ -0,0 +1,19 @@
+/*
+ * common.h
+ * Copyright (C) 2011 KLab Inc.
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <unistd.h>
+#include <limits.h>
+#include <string.h>
+#include <libgen.h>
+#include <errno.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+void dirbase(const char *path, char *d, char *f);
+int mkpidfile(char *path);
+int rmpidfile(char *path);
+uint64_t atoikmg(char *str);
+int mkdir_ex(const char *path);