Improved file manager API functions

bin/v-open-fs-file

@@ -5,35 +5,42 @@
 # The function opens/reads files on the file system
 
 user=$1
-path=$2
+src_file=$2
 
 # Checking arguments
-if [ -z "$path" ]; then
-    echo "Usage: USER PATH"
+if [ -z "$src_file" ]; then
+    echo "Usage: USER FILE"
     exit 1
 fi
 
 # Checking vesta user
 if [ ! -e "$VESTA/data/users/$user" ]; then
-    exit 1
+    echo "Error: vesta user $user doesn't exist"
+    exit 3
 fi
 
 # Checking user homedir
 homedir=$(grep "^$user:" /etc/passwd | cut -f 6 -d :)
 if [ -z $homedir ]; then
-    exit 1
+    echo "Error: user home directory doesn't exist"
+    exit 12
 fi
 
 # Checking path
-if [ ! -z "$path" ]; then
-    rpath=$(readlink -f "$path")
+if [ ! -z "$src_file" ]; then
+    rpath=$(readlink -f "$src_file")
     if [ -z "$(echo $rpath |egrep "^/tmp|^$homedir")" ]; then
-        exit 1
+        echo "Error: invalid source path $src_file"
+        exit 2
     fi
 fi
 
 # Reading file
-sudo -u $user cat "$path"
+sudo -u $user cat "$src_file" 2>/dev/null
+if [ $? -ne 0 ]; then
+    echo "Error: file $src_file was not opened"
+    exit 3
+fi
 
 # Exiting
-exit $?
+exit