From 60782a5351d2306ac69f700bfb5ab458648190d7 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Sun, 21 May 2017 08:48:20 -0700 Subject: Adding base-name and dir-name functions. * stream.c (path_sep_chars): New global variable. (detect_path_separators): New static function. (base_name, dir_name): New functions. (stream_init): Call detect_path_separators. Register base-name and dir-name intrinsic functions, and path-sep-chars variable. * stream.h (path_sep_chars, base_name, dir_name): Declared. * txr.c (dirname): Static function removed. (sysroot_init): Use dir_name instead of dirname. * txr.1: Documented dir-name, base-name and path-sep-chars. --- txr.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'txr.c') diff --git a/txr.c b/txr.c index 5b0ade21..743530c3 100644 --- a/txr.c +++ b/txr.c @@ -273,12 +273,6 @@ static val maybe_sysroot(val exepart) sysroot_path = sub_str(prog_path, 0, neg(length(exepart)))); } -static val dirname(val path) -{ - val rslash = rpos(chr('/'), path, nil, nil); - return if3(rslash, sub_str(path, zero, succ(rslash)), path); -} - static val substitute_basename(val edited_path, val source_path) { val lslash = rpos(chr('/'), edited_path, nil, nil); @@ -311,7 +305,7 @@ static void sysroot_init(void) #if HAVE_WINDOWS_H prog_path = regsub(slash, lit("/"), prog_path); #endif - prog_dir = dirname(prog_path); + prog_dir = dir_name(prog_path); if (!(maybe_sysroot(lit(TXR_REL_PATH)) || maybe_sysroot(lit(TXR_REL_PATH EXE_SUFF)) || -- cgit v1.2.3