Changeset 182 for trunk/foundation/class_c/nomfilepath.c

Timestamp:

Jan 7, 2007, 10:36:11 PM (19 years ago)

Author:

cinc

Message:

More fixes for string and path classes.

File:

• trunk/foundation/class_c/nomfilepath.c (modified) (1 diff)

trunk/foundation/class_c/nomfilepath.c

@@ -57 +57 @@
 {
   gchar*  chrTemp;
+  PNOMPath np;
 
   if(!nomPath)
-    return (PNOMPath)NOMPath_copy(nomSelf, NULLHANDLE);
+    return (PNOMPath)NOMPath_appendSeparator(nomSelf, NULLHANDLE);
 
   if(0==NOMPath_length((NOMString*)nomPath, ev))
     return NOMPath_appendSeparator(nomSelf, ev);
 
+  chrTemp=NOMPath_queryCString(nomPath, NULLHANDLE);
   if(G_DIR_SEPARATOR==chrTemp[0])
-    NOMPath_stripSeparator(nomSelf, ev);
-  else
-    NOMPath_appendSeparator(nomSelf, ev); /* Make sure current path has a separator */
-
-  return (NOMPath*) NOMPath_append((NOMString*) nomSelf, (NOMString*)nomPath, NULLHANDLE);
+    np=NOMPath_stripSeparator(nomSelf, ev);
+  else{
+    np=NOMPath_appendSeparator(nomSelf, ev); /* Make sure current path has a separator */
+  }
+
+  return (NOMPath*) NOMPath_append((NOMString*) np, (NOMString*)nomPath, NULLHANDLE);
 }