Switch to unified view

a/src/utils/pathut.h b/src/utils/pathut.h
1
#ifndef _PATHUT_H_INCLUDED_
1
#ifndef _PATHUT_H_INCLUDED_
2
#define _PATHUT_H_INCLUDED_
2
#define _PATHUT_H_INCLUDED_
3
/* @(#$Id: pathut.h,v 1.3 2005-01-31 14:31:10 dockes Exp $  (C) 2004 J.F.Dockes */
3
/* @(#$Id: pathut.h,v 1.4 2005-12-13 12:42:59 dockes Exp $  (C) 2004 J.F.Dockes */
4
4
5
#include <string>
5
#include <string>
6
6
7
inline void path_catslash(std::string &s) {
7
extern void path_catslash(std::string &s);
8
    if (s.empty() || s[s.length() - 1] != '/')
8
extern std::string path_cat(const std::string &s1, const std::string &s2);
9
  s += '/';
10
}
11
inline void path_cat(std::string &s1, const std::string &s2) {
12
    path_catslash(s1);
13
    s1 += s2;
14
}
15
           
16
extern std::string path_getsimple(const std::string &s);
9
extern std::string path_getsimple(const std::string &s);
17
extern std::string path_getfather(const std::string &s);
10
extern std::string path_getfather(const std::string &s);
18
extern std::string path_home();
11
extern std::string path_home();
19
extern std::string path_tildexpand(const std::string &s);
12
extern std::string path_tildexpand(const std::string &s);
20
13