relativeFileNormalization-fix.diff

   1 ---
   2
   3  source/macro.c  |    2 +-
   4  source/menu.c   |    5 +++--
   5  util/getfiles.c |    4 ++--
   6  3 files changed, 6 insertions(+), 5 deletions(-)
   7
   8 diff --quilt old/util/getfiles.c new/util/getfiles.c
   9 --- old/util/getfiles.c
  10 +++ new/util/getfiles.c
  11 @@ -1623,11 +1623,11 @@ static Boolean removeDotEntry(Widget lis
  12
  13          /* Convert Motif compound string to C string */
  14          XmStringGetLtoR(items[i], XmSTRING_DEFAULT_CHARSET, &filename);
  15
  16          /* Get basename from list item */
  17 -        ParseFilename(filename, basename, NULL);
  18 +        ParseFilename(filename, basename, NULL, NULL);
  19
  20          /* Free C string, allocated by XmStringGetLtoR(). */
  21          XtFree(filename);
  22
  23          /* if this is the dotEntry... */
  24 @@ -1711,11 +1711,11 @@ static int isHiddenFile(const char* full
  25  {
  26      /* array to hold basename */
  27      char basename[MAXPATHLEN + 1];
  28
  29      /* Extract basename from full filename */
  30 -    ParseFilename(fullname, basename, NULL);
  31 +    ParseFilename(fullname, basename, NULL, NULL);
  32
  33      if (0 == strcmp(basename, "..")) {
  34          /* Return False for parent directory */
  35          return False;
  36      } else {
  37 diff --quilt old/source/menu.c new/source/menu.c
  38 --- old/source/menu.c
  39 +++ new/source/menu.c
  40 @@ -5035,11 +5035,12 @@ static void updatePrevOpenMenu(WindowInf
  41          if (index >= NPrevOpen) {
  42              /* unmanaging before destroying stops parent from displaying */
  43              XtUnmanageChild(items[n]);
  44              XtDestroyWidget(items[n]);
  45          } else {
  46 -            ParseFilename(prevOpenSorted[index], filename, pathname);
  47 +            ParseFilename(prevOpenSorted[index], filename, pathname,
  48 +                    window->path);
  49              fileIsOpen = !!FindWindowWithFile(filename, pathname);
  50              XtVaSetValues(items[n],
  51                  XmNlabelString, st1=XmStringCreateSimple(prevOpenSorted[index]),
  52                  XmNset, fileIsOpen,
  53                  NULL);
  54 @@ -5051,11 +5052,11 @@ static void updatePrevOpenMenu(WindowInf
  55          }
  56      }
  57
  58      /* Add new items for the remaining file names to the menu */
  59      for (; index<NPrevOpen; index++) {
  60 -        ParseFilename(prevOpenSorted[index], filename, pathname);
  61 +        ParseFilename(prevOpenSorted[index], filename, pathname, window->path);
  62          fileIsOpen = !!FindWindowWithFile(filename, pathname);
  63          btn = XtVaCreateManagedWidget("win", xmToggleButtonWidgetClass,
  64                  window->prevOpenMenuPane,
  65                  XmNlabelString, st1=XmStringCreateSimple(prevOpenSorted[index]),
  66                  XmNmarginHeight, 0,
  67 diff --quilt old/source/macro.c new/source/macro.c
  68 --- old/source/macro.c
  69 +++ new/source/macro.c
  70 @@ -5423,11 +5423,11 @@ static int neditHomeMV(WindowInfo* windo
  71          DataValue* result, char** errMsg)
  72  {
  73      const char* neditRCName = GetRCFileName(NEDIT_RC);
  74      char nedit_home[MAXPATHLEN];
  75
  76 -    if (0 != ParseFilename(neditRCName, NULL, nedit_home)) {
  77 +    if (0 != ParseFilename(neditRCName, NULL, nedit_home, NULL)) {
  78          M_FAILURE("Unable to parse nedit rc file name in %s");
  79      }
  80
  81      result->tag = STRING_TAG;
  82      AllocNStringCpy(&result->val.str, nedit_home);