X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fltt%2Ftracefile.c;h=ee77b7af2188c82c0b08c288f76626cd6006c1dc;hb=e076699e6578637959dd0a6b175a8fa5d18dce38;hp=d752962acc61b1864b030e767a4315cf7e5663d7;hpb=43da6a594b6344036fbc1bdf259b514a11bfb670;p=lttv.git

diff --git a/ltt/branches/poly/ltt/tracefile.c b/ltt/branches/poly/ltt/tracefile.c
index d752962a..ee77b7af 100644
--- a/ltt/branches/poly/ltt/tracefile.c
+++ b/ltt/branches/poly/ltt/tracefile.c
@@ -365,8 +365,41 @@ void getCpuFileInfo(LttTrace *t, char* cpu)
  *
  *When a trace is closed, all the associated facilities, types and fields
  *are released as well.
+ *
+ * MD : If pathname is already absolute, we do not add current working
+ * directory to it.
+ *
  ****************************************************************************/
 
+void get_absolute_pathname(const char *pathname, char * abs_pathname)
+{
+  char * ptr, *ptr1;
+  size_t size = DIR_NAME_SIZE;
+  abs_pathname[0] = '\0';
+
+	if(pathname[0] == '/')
+	{
+    strcat(abs_pathname, pathname);
+		return;
+	}
+
+  if(!getcwd(abs_pathname, size)){
+    g_warning("Can not get current working directory\n");
+    strcat(abs_pathname, pathname);
+    return;
+  }
+
+  strcat(abs_pathname,"/");
+  
+  ptr = (char*)pathname;
+  ptr1 = ptr + 1;
+  while(*ptr == '.' && *ptr1 == '.'){
+    ptr += 3;
+    ptr1 = ptr + 1;
+  }
+  strcat(abs_pathname,ptr);
+}
+
 LttTrace *ltt_trace_open(const char *pathname)
 {
   LttTrace  * t;
@@ -376,30 +409,33 @@ LttTrace *ltt_trace_open(const char *pathname)
   char control[DIR_NAME_SIZE];
   char cpu[DIR_NAME_SIZE];
   char tmp[DIR_NAME_SIZE];
+  char abs_path[DIR_NAME_SIZE];
   gboolean has_slash = FALSE;
 
+  get_absolute_pathname(pathname, abs_path);
+  
   //establish the pathname to different directories
-  if(pathname[strlen(pathname)-1] == '/')has_slash = TRUE;
-  strcpy(eventdefs,pathname);
+  if(abs_path[strlen(abs_path)-1] == '/')has_slash = TRUE;
+  strcpy(eventdefs,abs_path);
   if(!has_slash)strcat(eventdefs,"/");
   strcat(eventdefs,"eventdefs/");
 
-  strcpy(info,pathname);
+  strcpy(info,abs_path);
   if(!has_slash)strcat(info,"/");
   strcat(info,"info/");
 
-  strcpy(control,pathname);
+  strcpy(control,abs_path);
   if(!has_slash)strcat(control,"/");
   strcat(control,"control/");
 
-  strcpy(cpu,pathname);
+  strcpy(cpu,abs_path);
   if(!has_slash)strcat(cpu,"/");
   strcat(cpu,"cpu/");
 
   //new trace
   t               = g_new(LttTrace, 1);
   sys_description = g_new(LttSystemDescription, 1);  
-  t->pathname     = g_strdup(pathname);
+  t->pathname     = g_strdup(abs_path);
   t->facility_number          = 0;
   t->control_tracefile_number = 0;
   t->per_cpu_tracefile_number = 0;