From b8445a158c56fcc1058cd6b53549651b75c3f103 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 9 Jul 2006 04:39:10 +0000 Subject: [PATCH] * data/c.m4 (b4_basename): Simplify a bit, since we don't need the full POSIX semantics (and weren't implementing them anyway). --- ChangeLog | 6 +++++- data/c.m4 | 9 ++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6ad089a4..51e3a41e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2006-07-08 Paul Eggert + * data/c.m4 (b4_basename): Simplify a bit, since we don't + need the full POSIX semantics (and weren't implementing them + anyway). + Adjust to Autoconf 2.60 and today's gnulib. * bootstrap (gnulib_modules): Add stdint. Remove special case for m4/onceonly_2_57.m4, since gnulib-tool @@ -47,7 +51,7 @@ 2006-07-08 Akim Demaille - * data/c.m4 (b4_dirname): New. + * data/c.m4 (b4_basename): New. (b4_syncline): Also output the location of its invocation (from the skeleton). (b4_user_action, b4_define_user_action, b4_user_actions) diff --git a/data/c.m4 b/data/c.m4 index 33b4ddda..4e745c0a 100644 --- a/data/c.m4 +++ b/data/c.m4 @@ -410,17 +410,16 @@ m4_define([b4_c_arg], # b4_basename(NAME) # ----------------- +# Similar to POSIX basename; the differences don't matter here. # Beware that NAME is not evaluated. m4_define([b4_basename], -[m4_case([$1], - [/], [/], - [m4_bpatsubst([$1], [^.*/\([^/]+\)/?$], [\1])])]) - +[m4_bpatsubst([$1], [^.*/\([^/]+\)/*$], [\1])]) + # b4_syncline(LINE, FILE) # ----------------------- m4_define([b4_syncline], -[b4_flag_if([synclines], +[b4_flag_if([synclines], [/* Line __line__ of b4_basename(m4_quote(__file__)). */ [#]line $1 $2])]) -- 2.45.2