Roxen.git/ server/ etc/ modules/ Roxen.pmod

2003-04-15

2003-04-15 15:23:58 by Anders Johansson <anders@roxen.com>

• 594bf3fff2425232db48f54cf6bebb3e4a02eef4 (12 lines) (+8/-4) ^{[ Show | Annotate ]}
  Branch: 5.2

Adjust fix_relative() for changed behaviour of dirname() in Pike 7.4. Solves [bug 3355 (#3355)].

Rev: server/etc/modules/Roxen.pmod:1.156

1:   // This is a roxen pike module. Copyright © 1999 - 2001, Roxen IS.   // - // $Id: Roxen.pmod,v 1.155 2003/04/09 14:01:02 anders Exp $ + // $Id: Roxen.pmod,v 1.156 2003/04/15 15:23:58 anders Exp $      #include <roxen.h>   #include <config.h>
1907:   //! root directory. The returned path is @[simplify_path()]:ed.   {    string path = id->not_query; -  if( !search( file, "http:" ) ) +  if( has_prefix( file, "http:" ) )    return file;       [string prefix, file] = win_drive_prefix(file);
1917:    ;    else if(file != "" && file[0] == '#')    file = path + file; -  else -  file = dirname(path) + "/" + file; +  else { +  string dir = dirname(path); +  if (dir == "/") file = "/" + file; +  else file = dir + "/" + file; +  }    return simplify_path(prefix + file);   }