changeset 2663:5189bc0a26e7

Merge remote-tracking branch 'upstream/develop' into minc4itk
author Vladimir S. FONOV <vladimir.fonov@gmail.com>
date Wed, 11 Apr 2012 11:55:38 -0400
parents b48f2e04954b (current diff) 6dae0da66b3c (diff)
children 8da0a6ec9c45
files
diffstat 2 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+2012-04-10  Andrew L Janke <a.janke@gmail.com>
+   * libsrc2/grpattr.c: added a history patch from Leila
 
 2012-03-14  Andrew L Janke <a.janke@gmail.com>
    * added progs/mincsample
--- a/libsrc2/grpattr.c
+++ b/libsrc2/grpattr.c
@@ -592,7 +592,12 @@
 	return (MI_ERROR);
     }
 
-    strncpy(fullpath, MI_ROOT_PATH "/" MI_INFO_NAME, sizeof (fullpath));
+    if (strcmp(name,"history")) {
+        strncpy(fullpath, MI_ROOT_PATH "/" MI_INFO_NAME, sizeof (fullpath));
+    }
+    else {
+        strncpy(fullpath, MI_ROOT_PATH "/" , sizeof (fullpath));
+    }
     if (*path != '/') {
         strncat(fullpath, "/", sizeof (fullpath) - strlen(fullpath));
     }