[BACK]Return to AHTURLTools.c CVS log [TXT] [DIR] Up to [Public] / Amaya / amaya

Diff for /Amaya/amaya/AHTURLTools.c between versions 1.93 and 1.94

version 1.93, 2000/03/17 12:24:32 version 1.94, 2000/03/20 17:19:32
Line 1053  CHAR_T*             otherPath; Line 1053  CHAR_T*             otherPath;
        && (length == 0 || tempOrgName[length-1] != TEXT('.')))         && (length == 0 || tempOrgName[length-1] != TEXT('.')))
          tempOrgName[length] = WC_EOS;           tempOrgName[length] = WC_EOS;
   
    if (IsW3Path (tempOrgName) || IsFilePath (tempOrgName))     if (IsW3Path (tempOrgName))
      {       {
        /* the name is complete, go to the Sixth Step */         /* the name is complete, go to the Sixth Step */
        ustrcpy (newName, tempOrgName);         ustrcpy (newName, tempOrgName);
Line 1722  CHAR_T**     url; Line 1722  CHAR_T**     url;
   if (*path == used_sep && *(path+1) == used_sep)    if (*path == used_sep && *(path+1) == used_sep)
     /* Some URLs start //<foo> */      /* Some URLs start //<foo> */
     path += 1;      path += 1;
     else if (IsFilePath (path))
       {
         /* doesn't need to do anything more */
         return;
       }
   else if (!ustrncmp (path, TEXT("news:"), 5))    else if (!ustrncmp (path, TEXT("news:"), 5))
     {      {
       newptr = ustrchr (path+5, TEXT('@'));        newptr = ustrchr (path+5, TEXT('@'));
Line 1837  CHAR_T*              target; Line 1842  CHAR_T*              target;
        /* remove the prefix file: */         /* remove the prefix file: */
        start_index += 5;         start_index += 5;
         
        if (ustrncmp (&src[start_index], TEXT("/localhost"), 10) == 0)  
        /* remove the localhost prefix */         /* remove the localhost prefix */
          start_index += 10;         if (ustrncmp (&src[start_index], TEXT("//localhost/"), 12) == 0)
              start_index += 11;
          
          /* remove the first two slashes in / / /path */
          while (src[start_index] &&
                 src[start_index] == TEXT('/') 
                 && src[start_index + 1] == TEXT('/'))
            start_index++;
   
   #ifdef _WINDOWS
          /* remove any extra slash before the drive name */
          if (src[start_index] == TEXT('/')
              &&src[start_index+2] == TEXT(':'))
            start_index++;
   #endif /* _WINDOWS */
   
        if (src[start_index] == WC_EOS)         if (src[start_index] == WC_EOS)
        /* if there's nothing afterwards, add a DIR_STR */         /* if there's nothing afterwards, add a DIR_STR */
          ustrcpy (target, WC_DIR_STR);           ustrcpy (target, WC_DIR_STR);
   #ifdef 0
          /* JK: removed the conversion of homedir in a file: url */
 #ifndef _WINDOWS  #ifndef _WINDOWS
        else if (src[start_index] == TEXT('~'))         else if (src[start_index] == TEXT('~'))
          {           {
Line 1855  CHAR_T*              target; Line 1875  CHAR_T*              target;
            ustrcat (&target[i], &src[start_index]);             ustrcat (&target[i], &src[start_index]);
          }           }
 #endif /* _WINDOWS */  #endif /* _WINDOWS */
   #endif /* 0 */
        else         else
          {           {
            CleanCopyFileURL (target, &src[start_index]);             CleanCopyFileURL (target, &src[start_index]);
Removed from v.1.93  
changed lines
  Added in v.1.94

Webmaster