[Commits] r681 - trunk/daemon/src

[new-commit at lists.openvcp.org]

Author: cryptronic
Date: 2009-12-07 17:08:22 +0000 (Mon, 07 Dec 2009)
New Revision: 681

Modified:
   trunk/daemon/src/node.c
   trunk/daemon/src/userbackup.c
Log:
small fixes


Modified: trunk/daemon/src/node.c
===================================================================
--- trunk/daemon/src/node.c	2009-12-01 20:21:20 UTC (rev 680)
+++ trunk/daemon/src/node.c	2009-12-07 17:08:22 UTC (rev 681)
@@ -16,6 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include "node.h"
 
 #include <stdlib.h>
 #include <unistd.h>
@@ -25,7 +26,6 @@
 #include <sys/types.h>
 #include <sys/statvfs.h>
 
-#include "node.h"
 #include "strings.h"
 #include "fs.h"
 #include "config.h"
@@ -589,7 +589,7 @@
 struct ovcp_response_st *node_get_space(struct ovcp_request_st *request)
 {
 	struct ovcp_response_st *response;
-	struct statvfs64 vfsinfo;
+	struct statvfs vfsinfo;
 
 	if(statvfs(global_settings.root_dir, &vfsinfo) == -1)
 		return ovcp_response_error(OVCP_ERROR_UNABLSPACE, "node.get_space: "OVCP_ERROR_UNABLSPACE_DESC);
@@ -599,9 +599,9 @@
 
 	ovcp_response_struct_new(response);
 
-	ovcp_response_struct_add_int(response, "space_total", vfsinfo.f_blocks/1024*vfsinfo.f_bsize);
-	ovcp_response_struct_add_int(response, "space_free", vfsinfo.f_bfree/1024*vfsinfo.f_bsize);
-	ovcp_response_struct_add_int(response, "inodes_total", vfsinfo.f_files);
+	ovcp_response_struct_add_double(response, "space_total", vfsinfo.f_blocks/1024*vfsinfo.f_bsize);
+	ovcp_response_struct_add_double(response, "space_free", vfsinfo.f_bfree/1024*vfsinfo.f_bsize);
+	ovcp_response_struct_add_double(response, "inodes_total", vfsinfo.f_files);
 
 	ovcp_response_struct_end(response);
 

Modified: trunk/daemon/src/userbackup.c
===================================================================
--- trunk/daemon/src/userbackup.c	2009-12-01 20:21:20 UTC (rev 680)
+++ trunk/daemon/src/userbackup.c	2009-12-07 17:08:22 UTC (rev 681)
@@ -53,7 +53,7 @@
 		return ovcp_response_error(OVCP_ERROR_VSNOTEXIST, OVCP_ERROR_VSNOTEXIST_DESC);
 	if(!dir_exist(global_settings.userbackup_dir))
 		return ovcp_response_error(OVCP_ERROR_BCKDIRNFUOD, OVCP_ERROR_BCKDIRNFUOD_DESC);
-	
+
 	response = ovcp_response_new();
 
 	if((dir_ptr = opendir(global_settings.userbackup_dir)) != NULL)
@@ -152,7 +152,7 @@
 	userbackupdir = concat(global_settings.userbackup_dir, "/", backupname, NULL);
 	homedir = concat(global_settings.root_dir, "/", name, "/", NULL);
 
-	if((rsyncoutput = exec_cmd("rsync", 65535, "rsync", "-a", "--stats", homedir, userbackupdir, NULL)) == NULL)
+	if((rsyncoutput = exec_cmd("rsync", 65535, "rsync", "-a", "-H", "-l", "--stats", homedir, userbackupdir, NULL)) == NULL)
 	{
 		execb_cmd("rm", "rm", "-rf", userbackupdir, NULL);
 		return ovcp_response_error(OVCP_ERROR_BACKUPFAIL, OVCP_ERROR_BACKUPFAIL_DESC);
@@ -317,7 +317,7 @@
 		if(!dir_exist(userbackupdir))
 			return ovcp_response_error(OVCP_ERROR_BACKUPFAIL, OVCP_ERROR_BACKUPFAIL_DESC);
 
-		if((rsyncoutput = exec_cmd("rsync", 65535, "rsync", "-a", "--stats", "--delete", homedir, userbackupdir, NULL)) == NULL)
+		if((rsyncoutput = exec_cmd("rsync", 65535, "rsync", "-a", "-H", "-l", "--stats", "--delete", homedir, userbackupdir, NULL)) == NULL)
 		{
 			return ovcp_response_error(OVCP_ERROR_BACKUPFAIL, OVCP_ERROR_BACKUPFAIL_DESC);
 		}