Changeset 5810:d44ff4605fa5 in roaraudio for libroar

Timestamp:

01/05/13 00:56:36 (11 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added a lot paths to our path config (roar_libroar_get_path())

File:

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

libroar/config.c

@@ -439 +439 @@
  const char * name;
  const char * path;
- const int    with_product;
+ const int    with_product; // 0 = no, 1 = yes, 2 = just product.
  const int    with_provider;
 } __paths[] = {
  {"prefix",     ROAR_PREFIX, 0, 0},
  {"prefix-bin", ROAR_PREFIX_BIN, 0, 0},
+ {"prefix-sbin", ROAR_PREFIX_SBIN, 0, 0},
  {"prefix-lib", ROAR_PREFIX_LIB, 0, 0},
  {"prefix-inc", ROAR_PREFIX_INC, 0, 0},
  {"prefix-man", ROAR_PREFIX_MAN, 0, 0},
- {"prefix-pc",  ROAR_PREFIX_PC, 0, 0},
- {"prefix-ckport",  ROAR_PREFIX_CKPORT, 0, 0},
- {"prefix-comp-libs", ROAR_PREFIX_COMP_LIBS, 0, 0},
- {"prefix-comp-bins", ROAR_PREFIX_COMP_BINS, 0, 0},
- {"prefix-plugins", ROAR_PREFIX_PLUGINS, 1, 1},
+ {"prefix-man1", ROAR_PREFIX_MAN "/man1", 0, 0},
+ {"prefix-man2", ROAR_PREFIX_MAN "/man2", 0, 0},
+ {"prefix-man3", ROAR_PREFIX_MAN "/man3", 0, 0},
+ {"prefix-man4", ROAR_PREFIX_MAN "/man4", 0, 0},
+ {"prefix-man5", ROAR_PREFIX_MAN "/man5", 0, 0},
+ {"prefix-man6", ROAR_PREFIX_MAN "/man6", 0, 0},
+ {"prefix-man7", ROAR_PREFIX_MAN "/man7", 0, 0},
+ {"prefix-man8", ROAR_PREFIX_MAN "/man8", 0, 0},
+ {"prefix-man9", ROAR_PREFIX_MAN "/man9", 0, 0},
+ {"prefix-pc",          ROAR_PREFIX_PC, 0, 0},
+ {"prefix-ckport",      ROAR_PREFIX_CKPORT, 0, 0},
+ {"prefix-sysconf",     ROAR_PREFIX_SYSCONF, 0, 0},
+ {"prefix-dev",         ROAR_PREFIX_DEV, 0, 0},
+ {"prefix-doc",         ROAR_PREFIX_DOC, 2, 0},
+ {"prefix-tmp",         ROAR_PREFIX_TMP, 0, 0},
+ {"prefix-var",         ROAR_PREFIX_VAR, 0, 0},
+ {"prefix-cache",       ROAR_PREFIX_CACHE, 2, 0},
+ {"prefix-data",        ROAR_PREFIX_DATA, 2, 0},
+ {"prefix-lock",        ROAR_PREFIX_LOCK, 0, 0},
+ {"prefix-log",         ROAR_PREFIX_LOG, 0, 0},
+ {"prefix-mail",        ROAR_PREFIX_MAIL, 0, 0},
+ {"prefix-run",         ROAR_PREFIX_RUN, 0, 0},
+ {"prefix-spool",       ROAR_PREFIX_SPOOL, 2, 0},
+ {"prefix-comp-libs",   ROAR_PREFIX_COMP_LIBS, 0, 0},
+ {"prefix-comp-bins",   ROAR_PREFIX_COMP_BINS, 0, 0},
+ {"prefix-plugins",     ROAR_PREFIX_PLUGINS, 1, 1},
  {"prefix-buildsystem", ROAR_PREFIX_BUILDSYSTEM, 0, 0}
 };
 
-static int __product2path(char * path, size_t pathlen, int null_as_universal, const char * product) {
+static int __product2path(char * path, size_t pathlen, int null_as_universal, const char * product, int type) {
  const char * c;
  const char * e;
@@ -463 +485 @@
  if ( product == NULL ) {
   if ( null_as_universal ) {
-   snprintf(path, pathlen, "/universal/universal");
+   if ( type == 2 ) {
+    snprintf(path, pathlen, "/universal");
+   } else {
+    snprintf(path, pathlen, "/universal/universal");
+   }
   } else {
    path[0] = 0;
@@ -483 +509 @@
  s = strstr(c, "/");
 
- if ( s == NULL ) {
+ if ( type == 2 ) {
+  snprintf(path, pathlen, "/%.*s", (int)(size_t)(b-product), product);
+ } else if ( s == NULL ) {
   snprintf(path, pathlen, "/unreg-%.*s/%.*s", (int)(size_t)(e-c), c, (int)(size_t)(b-product), product);
  } else {
@@ -548 +576 @@
   }
 
-  if ( __product2path(buf_product, sizeof(buf_product), null_as_universal, product) == -1 )
+  if ( __product2path(buf_product, sizeof(buf_product), null_as_universal, product, __paths[i].with_product) == -1 )
    return NULL;