Changeset 18073

Timestamp:

Jun 10, 2008, 11:53:09 AM (18 years ago)

Author:

jhoblitt

Message:

enable pmConfigConvertFilename()'s truncate argument

Location:

trunk/psModules/src/config

Files:

• pmConfig.c (modified) (7 diffs)
• pmConfig.h (modified) (2 diffs)

trunk/psModules/src/config/pmConfig.c

@@ -42 +42 @@
 static bool readCameraConfig = true;    // Read the camera config on startup (with pmConfigRead)?
 static psArray *configPath = NULL;      // Search path for configuration files
+
+static bool checkPath(const char *filename, bool create, bool trunc);
 
 bool pmConfigReadParamsSet(bool newReadCameraConfig)
@@ -1490 +1492 @@
 
 // convert the supplied name, create a new output psString
-psString pmConfigConvertFilename(const char *filename, const pmConfig *config, bool create, bool truncate)
+psString pmConfigConvertFilename(const char *filename, const pmConfig *config, bool create, bool trunc)
 {
     PS_ASSERT_STRING_NON_EMPTY(filename, NULL);
@@ -1507 +1509 @@
         newName = tmpName;
 
-        if (!create && access(newName, R_OK) != 0) {
-            psError(PS_ERR_IO, true, "Unable to access file %s", newName);
-            psFree(newName);
+        if (!checkPath(newName, create, trunc)) {
+            // let checkPath()'s psError() call float up
+            psFree (newName);
             return NULL;
         }
@@ -1556 +1558 @@
         newName = tmpName;
 
-        if (!create && access(newName, R_OK) != 0) {
-            psError(PS_ERR_IO, true, "Unable to access file %s", newName);
-            psFree(newName);
+        if (!checkPath(newName, create, trunc)) {
+            // let checkPath()'s psError() call float up
+            psFree (newName);
             return NULL;
         }
+
         return newName;
     }
@@ -1596 +1599 @@
 
         char *nebfile = NULL;
-        if (create) {
-            nebfile = nebCreate(server, filename, NULL, NULL);
-            if (!nebfile) {
-                psError(PM_ERR_SYS, true, "failed to create a new nebulous key: %s", nebErr(server));
-                nebServerFree(server);
-                return NULL;
-            }
-        } else {
-            nebfile = nebFind(server, filename);
-            if (!nebfile) {
-                psError(PM_ERR_SYS, true, "failed to find nebulous key: %s", nebErr(server));
+        if (!(nebfile = nebFind(server, filename))) {
+            // object does not exist
+            if (create) {
+                nebfile = nebCreate(server, filename, NULL, NULL);
+                if (!nebfile) {
+                    psError(PM_ERR_SYS, true, "failed to create a new nebulous key: %s", nebErr(server));
+                    nebServerFree(server);
+                    return NULL;
+                }
+            } else {
+                // if the object does not exist and create isn't set, then we
+                // should puke
+                psError(PM_ERR_SYS, true, "Unable to access file %s", filename);
                 nebServerFree(server);
                 return NULL;
@@ -1616 +1621 @@
         nebFree(nebfile);
         nebServerFree(server);
+
+        if (trunc) {
+            if(truncate(filename, 0) != 0) {
+                psError(PS_ERR_IO, true, "Failed to truncate file, %s\n", filename);
+                nebServerFree(server);
+                return NULL;
+            }
+        }
 
         return path;
@@ -1694 +1707 @@
 }
 
+static bool checkPath(const char *filename, bool create, bool trunc)
+{
+    PS_ASSERT_PTR_NON_NULL(filename, false);
+
+    if (access(filename, R_OK) == 0) {
+        // file already exists
+        if (trunc) {
+            if(truncate(filename, 0) != 0) {
+                psError(PS_ERR_IO, true, "Failed to truncate file, %s\n", filename);
+                return false;
+            }
+        }
+    } else {
+        // file does not exist
+        if (create) {
+            int fd = open(filename, O_WRONLY|O_CREAT, 0666);
+            if (fd == 0) {
+                psError(PS_ERR_IO, true, "Failed to close file, %s\n", filename);
+                return false;
+            }
+            if (close(fd) != 0) {
+                psError(PS_ERR_IO, true, "Failed to close file, %s\n", filename);
+                return false;
+            }
+        } else {
+            // if the file does not exist and create isn't set, then we
+            // should puke
+            psError(PS_ERR_IO, true, "Unable to access file %s", filename);
+            return false;
+        }
+    }
+
+    return true;
+}
+
 
 #if 0

trunk/psModules/src/config/pmConfig.h

@@ -5 +5 @@
  *  @author Eugene Magnier, IfA
  *
- *  @version $Revision: 1.37 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-06-10 20:28:25 $
+ *  @version $Revision: 1.38 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-06-10 21:53:09 $
  *  Copyright 2005-2006 Institute for Astronomy, University of Hawaii
  */
@@ -164 +164 @@
     const pmConfig *config,             ///< configuration
     bool create,                        ///< create the file if it doesn't exist
-    bool truncate                       ///< truncate the file (if it exists)
+    bool trunc                          ///< truncate the file (if it exists)
 );