Changeset 5811:28f6eed531d7 in roaraudio for libroar/env.c

Timestamp:

01/05/13 01:29:03 (11 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

improved roar_env_render_path_r() and added support for it to roar-config

File:

• libroar/env.c (modified) (4 diffs)

libroar/env.c

@@ -121 +121 @@
 }
 
+static char * __get_path(const char ** inpath) {
+ char buf_path[64];
+ size_t i;
+
+ (*inpath)++;
+
+ for (i = 0; i < sizeof(buf_path); i++) {
+  if ( (*inpath)[i] == '/' || (*inpath)[i] == 0 ) {
+   break;
+  } else {
+   buf_path[i] = (*inpath)[i];
+  }
+ }
+
+ if ( i == sizeof(buf_path) ) {
+  roar_err_set(ROAR_ERROR_NOSPC);
+  return NULL;
+ }
+
+ buf_path[i] = 0;
+
+ (*inpath) += i;
+
+ return roar_libroar_get_path(buf_path, 0, NULL, NULL);
+}
+
 int roar_env_render_path_r(char * out, size_t len, const char * inpath) {
  size_t inlen;
@@ -126 +152 @@
  size_t homelen = 0;
  const char * home;
- enum { UNKNOWN, COPY, HOME } mode = UNKNOWN;
+ const char * prefix = NULL;
+ char * prefix_path = NULL;
+ enum { UNKNOWN, COPY, HOME, PREFIX } mode = UNKNOWN;
 
  if ( len == 0 && inpath == NULL )
@@ -159 +187 @@
   needlen = inlen + homelen - 1;
   mode    = HOME;
- }
-
- if ( len < (needlen + 1) )
-  return -1;
+  prefix  = home;
+  inpath++;
+ } else if ( inpath[0] == '$' ) {
+  prefix_path = __get_path(&inpath);
+  if ( prefix_path == NULL )
+   return -1;
+  needlen = roar_mm_strlen(inpath) + roar_mm_strlen(prefix_path) + 1;
+  mode    = PREFIX;
+  prefix  = prefix_path;
+ }
+
+ if ( len < (needlen + 1) ) {
+  if ( prefix_path != NULL )
+   roar_mm_free(prefix_path);
+  roar_err_set(ROAR_ERROR_NOSPC);
+  return -1;
+ }
 
  switch (mode) {
@@ -170 +211 @@
    break;
   case HOME:
-    roar_mm_strlcpy(out, home, len);
-    roar_mm_strlcat(out, inpath+1, len); // strip only ~, so we have the / if home is not /-terminated.
+  case PREFIX:
+    roar_mm_strlcpy(out, prefix, len);
+    roar_mm_strlcat(out, inpath, len); // strip only ~, so we have the / if home is not /-terminated.
    break;
   default:
+    if ( prefix_path != NULL )
+     roar_mm_free(prefix_path);
+    roar_err_set(ROAR_ERROR_NOTSUP);
     return -1;
    break;
  }
 
+ if ( prefix_path != NULL )
+  roar_mm_free(prefix_path);
  return 0;
 }