From 9849a73f387019b0aa94e195d8819f95ea378003 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Grubbstr=C3=B6m=20=28Grubba=29?=
<grubba@grubba.org>
Date: Fri, 8 Jun 2001 13:06:02 +0200
Subject: [PATCH] Updated AutoDoc mk II markup for combine_path() et al.
Rev: src/builtin_functions.c:1.376
---
src/builtin_functions.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/builtin_functions.c b/src/builtin_functions.c
index 12d5b5fd99..8f424de209 100644
--- a/src/builtin_functions.c
+++ b/src/builtin_functions.c
@@ -5,7 +5,7 @@
\*/
/**/
#include "global.h"
-RCSID("$Id: builtin_functions.c,v 1.375 2001/06/08 00:36:00 hubbe Exp $");
+RCSID("$Id: builtin_functions.c,v 1.376 2001/06/08 11:06:02 grubba Exp $");
#include "interpret.h"
#include "svalue.h"
#include "pike_macros.h"
@@ -1111,12 +1111,21 @@ PMOD_EXPORT void f_add_constant(INT32 args)
pop_n_elems(args);
}
-/*! @decl string combine_path(string absolute, string relative)
+/*! @decl string combine_path(string absolute, string ... relative)
+ *! @decl string combine_path_unix(string absolute, string ... relative)
+ *! @decl string combine_path_nt(string absolute, string ... relative)
*!
*! Concatenate a relative path to an absolute path and remove any
*! @tt{"//"@}, @tt{"/.."@} or @tt{"/."@} to produce a straightforward
*! absolute path as result.
*!
+ *! @[combine_path_nt()] concatenates according to NT-filesystem conventions,
+ *! while @[combine_path_unix()] concatenates according to UNIX-style.
+ *!
+ *! @[combine_path()] is equvivalent to @[combine_path_unix()] on UNIX-like
+ *! operating systems, and equvivalent to @[combine_path_nt()] on NT-like
+ *! operating systems.
+ *!
*! @seealso
*! @[getcwd()], @[Stdio.append_path()]
*/
--
GitLab