From 06d75a10a151feca72683dd43c5729e3c39176f7 Mon Sep 17 00:00:00 2001 From: "Steffen (Daode) Nurpmeso" Date: Tue, 28 Feb 2017 21:52:01 +0100 Subject: [PATCH] No underscores in files names (_only_ hyphen-minus).. Yes, until now we had a mixed usage. This was because C names cannot have hyphen-minus in them, and we need the n_FILE macro for compile-time-assertion expansions etc., e.g., typedef int n_CONCAT(avoid_empty_file__, n_FILE); So this would have been a no-go. However, let's ignore the fact that in such messages the filename will no longer match the real file name, but have instead ls(1) give a unique view. --- .gitignore | 2 +- COPYING | 4 ++-- accmacvar.c | 12 ++++++------ cmd_arg.c => cmd-arg.c | 2 +- cmd_cnd.c => cmd-cnd.c | 0 cmd_folder.c => cmd-folder.c | 0 cmd_headers.c => cmd-headers.c | 0 cmd_message.c => cmd-message.c | 0 cmd_misc.c => cmd-misc.c | 0 cmd_resend.c => cmd-resend.c | 0 cmd_tab.h => cmd-tab.h | 2 +- cmd_write.c => cmd-write.c | 0 okeys.h => gen-okeys.h | 2 +- tcaps.h => gen-tcaps.h | 2 +- gen-version.h | 4 ++++ ignore.c | 2 +- imap_search.c => imap-search.c | 0 lex_input.c => lex-input.c | 4 ++-- mime_enc.c => mime-enc.c | 0 mime_param.c => mime-param.c | 0 mime_parse.c => mime-parse.c | 0 mime_types.c => mime-types.c | 2 +- mk-mk.in | 32 ++++++++++++++++---------------- mk-okey-map.pl | 6 +++--- mk-release.inc | 4 ++-- mk-release.sh | 8 ++++---- mk-tcap-map.pl | 4 ++-- nail.h | 8 ++++---- nailfuns.h | 32 ++++++++++++++++---------------- nam_a_grp.c => nam-a-grp.c | 0 smtp_gssapi.h => smtp-gssapi.h | 0 smtp.c | 2 +- termcap.c | 2 +- tty.c | 6 +++--- ui_str.c => ui-str.c | 0 version.h | 4 ---- 36 files changed, 73 insertions(+), 73 deletions(-) rename cmd_arg.c => cmd-arg.c (99%) rename cmd_cnd.c => cmd-cnd.c (100%) rename cmd_folder.c => cmd-folder.c (100%) rename cmd_headers.c => cmd-headers.c (100%) rename cmd_message.c => cmd-message.c (100%) rename cmd_misc.c => cmd-misc.c (100%) rename cmd_resend.c => cmd-resend.c (100%) rename cmd_tab.h => cmd-tab.h (99%) rename cmd_write.c => cmd-write.c (100%) rename okeys.h => gen-okeys.h (99%) rename tcaps.h => gen-tcaps.h (99%) create mode 100644 gen-version.h rename imap_search.c => imap-search.c (100%) rename lex_input.c => lex-input.c (99%) rename mime_enc.c => mime-enc.c (100%) rename mime_param.c => mime-param.c (100%) rename mime_parse.c => mime-parse.c (100%) rename mime_types.c => mime-types.c (99%) rename nam_a_grp.c => nam-a-grp.c (100%) rename smtp_gssapi.h => smtp-gssapi.h (100%) rename ui_str.c => ui-str.c (100%) delete mode 100644 version.h diff --git a/.gitignore b/.gitignore index fc79ebce..20dbdc7a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ config.* *.mk +gen-mime-types.h -mime_types.h uman.1 urc.rc diff --git a/COPYING b/COPYING index be6b449f..9b66d783 100644 --- a/COPYING +++ b/COPYING @@ -82,7 +82,7 @@ */ ========================================================================== -mime_enc.c: +mime-enc.c: QP quoting idea, _b64_decode(), b64_encode(): /* @@ -115,7 +115,7 @@ QP quoting idea, _b64_decode(), b64_encode(): */ ========================================================================== -smtp_gssapi.h: +smtp-gssapi.h: partially derived from sample code in: /* diff --git a/accmacvar.c b/accmacvar.c index 174853e1..b1252d93 100644 --- a/accmacvar.c +++ b/accmacvar.c @@ -5,10 +5,10 @@ *@ - run mk-okey-map.pl *@ - update the manual! *@ TODO . should be recursive environment based. - *@ TODO Otherwise, the `localopts' should be an attribute of the lex_input.c + *@ TODO Otherwise, the `localopts' should be an attribute of the lex-input.c *@ TODO command context, so that it belongs to the execution context *@ TODO we are running in, instead of being global data. See, e.g., - *@ TODO the a_LEX_SPLICE comment in lex_input.c. + *@ TODO the a_LEX_SPLICE comment in lex-input.c. *@ TODO . once we can have non-fatal !0 returns for commands, we should *@ TODO return error if "(environ)? unset" goes for non-existent. * @@ -189,9 +189,9 @@ struct a_amv_var_carrier{ ui16_t avc_special_prop; }; -/* Include the constant mk-okey-map.pl output */ -#include "version.h" -#include "okeys.h" +/* Include the constant mk-okey-map.pl output, and the generated version data */ +#include "gen-version.h" +#include "gen-okeys.h" /* The currently active account */ static struct a_amv_mac *a_amv_acc_curr; @@ -1955,7 +1955,7 @@ FL void temporary_compose_mode_hook_call(char const *macname, void (*hook_pre)(void *), void *hook_arg){ /* TODO compose_mode_hook_call() temporary, v15: generalize; see a_LEX_SPLICE - * TODO comment in lex_input.c for the right way of doing things! */ + * TODO comment in lex-input.c for the right way of doing things! */ static struct a_amv_lostack *cmh_losp; struct a_amv_mac_call_args *amcap; struct a_amv_mac *amp; diff --git a/cmd_arg.c b/cmd-arg.c similarity index 99% rename from cmd_arg.c rename to cmd-arg.c index da06ab41..4bebf2cb 100644 --- a/cmd_arg.c +++ b/cmd-arg.c @@ -189,7 +189,7 @@ jleave: } FL bool_t -n_cmd_arg_parse(struct n_cmd_arg_ctx *cacp){ /* TODO use this for cmd_tab! */ +n_cmd_arg_parse(struct n_cmd_arg_ctx *cacp){ /* TODO use this for cmd-tab.h! */ struct n_cmd_arg ncap, *lcap; struct str shin_orig, shin; bool_t addca; diff --git a/cmd_cnd.c b/cmd-cnd.c similarity index 100% rename from cmd_cnd.c rename to cmd-cnd.c diff --git a/cmd_folder.c b/cmd-folder.c similarity index 100% rename from cmd_folder.c rename to cmd-folder.c diff --git a/cmd_headers.c b/cmd-headers.c similarity index 100% rename from cmd_headers.c rename to cmd-headers.c diff --git a/cmd_message.c b/cmd-message.c similarity index 100% rename from cmd_message.c rename to cmd-message.c diff --git a/cmd_misc.c b/cmd-misc.c similarity index 100% rename from cmd_misc.c rename to cmd-misc.c diff --git a/cmd_resend.c b/cmd-resend.c similarity index 100% rename from cmd_resend.c rename to cmd-resend.c diff --git a/cmd_tab.h b/cmd-tab.h similarity index 99% rename from cmd_tab.h rename to cmd-tab.h index 2f6740d2..d141f36a 100644 --- a/cmd_tab.h +++ b/cmd-tab.h @@ -1,5 +1,5 @@ /*@ S-nail - a mail user agent derived from Berkeley Mail. - *@ This is included by ./lex_input.c and defines the command array. + *@ This is included by ./lex-input.c and defines the command array. * * Copyright (c) 2000-2004 Gunnar Ritter, Freiburg i. Br., Germany. * Copyright (c) 2012 - 2017 Steffen (Daode) Nurpmeso . diff --git a/cmd_write.c b/cmd-write.c similarity index 100% rename from cmd_write.c rename to cmd-write.c diff --git a/okeys.h b/gen-okeys.h similarity index 99% rename from okeys.h rename to gen-okeys.h index f6b40d12..dd84afd1 100644 --- a/okeys.h +++ b/gen-okeys.h @@ -1,4 +1,4 @@ -/*@ okeys.h, generated by ./mk-okey-map.pl on Sat Dec 31 17:21:24 2016. +/*@ gen-okeys.h, generated by ./mk-okey-map.pl on Sat Dec 31 17:21:24 2016. *@ See accmacvar.c for more */ static char const a_amv_var_names[] = { diff --git a/tcaps.h b/gen-tcaps.h similarity index 99% rename from tcaps.h rename to gen-tcaps.h index a0e9a4ce..9cf6a60c 100644 --- a/tcaps.h +++ b/gen-tcaps.h @@ -1,4 +1,4 @@ -/*@ tcaps.h, generated by ./mk-tcap-map.pl on Sat Dec 31 17:21:25 2016. +/*@ gen-tcaps.h, generated by ./mk-tcap-map.pl on Sat Dec 31 17:21:25 2016. *@ See termcap.c for more */ static char const a_termcap_namedat[] = { diff --git a/gen-version.h b/gen-version.h new file mode 100644 index 00000000..7648230e --- /dev/null +++ b/gen-version.h @@ -0,0 +1,4 @@ +#define n_VERSION "v14.9.0-pre3" +#define n_VERSION_MAJOR "14" +#define n_VERSION_MINOR "9" +#define n_VERSION_UPDATE "0" diff --git a/ignore.c b/ignore.c index 91aba08c..4c087733 100644 --- a/ignore.c +++ b/ignore.c @@ -1,6 +1,6 @@ /*@ S-nail - a mail user agent derived from Berkeley Mail. *@ `headerpick', `retain' and `ignore'. - *@ XXX Should these be in nam_a_grp.c?! + *@ XXX Should these be in nam-a-grp.c?! * * Copyright (c) 2012 - 2017 Steffen (Daode) Nurpmeso . */ diff --git a/imap_search.c b/imap-search.c similarity index 100% rename from imap_search.c rename to imap-search.c diff --git a/lex_input.c b/lex-input.c similarity index 99% rename from lex_input.c rename to lex-input.c index 69a9d3d5..296c82ca 100644 --- a/lex_input.c +++ b/lex-input.c @@ -226,7 +226,7 @@ static bool_t a_lex__read_set(char const *cp, char const *value); # define DS(S) #endif static struct a_lex_cmd const a_lex_cmd_tab[] = { -#include "cmd_tab.h" +#include "cmd-tab.h" }, a_lex_special_cmd_tab[] = { { "#", NULL, n_CMD_ARG_TYPE_STRING, 0, 0 @@ -1332,7 +1332,7 @@ a_lex_source_file(char const *file, bool_t silent_open_error){ /* Being a command argument file is space-trimmed *//* TODO v15 with * TODO WYRALIST this is no longer necessary true, and for that we - * TODO don't set _PARSE_TRIMSPACE because we cannot! -> cmd_tab.h!! */ + * TODO don't set _PARSE_TRIMSPACE because we cannot! -> cmd-tab.h!! */ #if 0 ((ispipe = (!silent_open_error && (nlen = strlen(file)) > 0 && file[--nlen] == '|'))) diff --git a/mime_enc.c b/mime-enc.c similarity index 100% rename from mime_enc.c rename to mime-enc.c diff --git a/mime_param.c b/mime-param.c similarity index 100% rename from mime_param.c rename to mime-param.c diff --git a/mime_parse.c b/mime-parse.c similarity index 100% rename from mime_parse.c rename to mime-parse.c diff --git a/mime_types.c b/mime-types.c similarity index 99% rename from mime_types.c rename to mime-types.c index e3cce15a..b6ee43f6 100644 --- a/mime_types.c +++ b/mime-types.c @@ -95,7 +95,7 @@ struct mt_class_arg { }; static struct mtbltin const _mt_bltin[] = { -#include "mime_types.h" +#include "gen-mime-types.h" }; static char const _mt_typnames[][16] = { diff --git a/mk-mk.in b/mk-mk.in index c2a2c19f..1104bc78 100644 --- a/mk-mk.in +++ b/mk-mk.in @@ -3,8 +3,8 @@ SIZE_CHECK = @if ( command -v size ) > /dev/null 2>&1; then size $(@); fi -_version_from_header = VERSION="`< version.h $(sed) \ - -e '/ VERSION /b X' -e d -e ':X' \ +_version_from_header = VERSION="`< gen-version.h $(sed) \ + -e '/ n_VERSION /b X' -e d -e ':X' \ -e 's/[^\"]*\"v\([^\"]\{1,\}\)\"/\1/'`" OBJ = $(OBJ_SRC:.c=.o) @@ -20,13 +20,13 @@ $(VAL_UAGENT): $(OBJ) uman.1 urc.rc $(SIZE_CHECK) $(OBJ): config.h nail.h nailfuns.h $(AMALGAM_DEP) -$(AMALGAM_TARGET) accmacvar.o: okeys.h version.h +$(AMALGAM_TARGET) accmacvar.o: gen-okeys.h gen-version.h $(AMALGAM_TARGET) dotlock.o: dotlock.h -$(AMALGAM_TARGET) lex_input.o: cmd_tab.h -$(AMALGAM_TARGET) mime_types.o: mime_types.h +$(AMALGAM_TARGET) lex-input.o: cmd-tab.h +$(AMALGAM_TARGET) mime-types.o: gen-mime-types.h $(AMALGAM_TARGET) pop3.o smtp.o urlcrecry.o: rfc1321.h -$(AMALGAM_TARGET) smtp.o: smtp_gssapi.h -$(AMALGAM_TARGET) termcap.o: tcaps.h +$(AMALGAM_TARGET) smtp.o: smtp-gssapi.h +$(AMALGAM_TARGET) termcap.o: gen-tcaps.h $(VAL_PRIVSEP): privsep.o $(ECHO_LINK)$(CC) $(LDFLAGS) -o $(@) privsep.o $(BASE_LIBS) @@ -41,7 +41,7 @@ test: all awk=$(awk) cat=$(cat) cksum=$(cksum) rm=$(rm) sed=$(sed) grep=$(grep) \ $(SHELL) ./cc-test.sh --check-only ./$(VAL_UAGENT) -mime_types.h: mime.types +gen-mime-types.h: mime.types $(ECHO_GEN)\ LC_ALL=C < ./mime.types > $(@) $(awk) '\ function add(mt, ln) {\ @@ -238,7 +238,7 @@ uninstall: clean: $(ECHO_CMD)\ - $(rm) -f $(OBJ) $(VAL_UAGENT) ./mime_types.h ./uman.1 ./urc.rc;\ + $(rm) -f $(OBJ) $(VAL_UAGENT) ./gen-mime-types.h ./uman.1 ./urc.rc;\ if [ -n "$(OPTIONAL_PRIVSEP)" ]; then \ $(rm) -f ./privsep.o ./$(VAL_PRIVSEP);\ fi;\ @@ -263,7 +263,7 @@ _update-version: [ "`git status --porcelain |\ $(awk) '\ BEGIN {n=0}\ - /version\.h/ {next}\ + /gen-version\.h/ {next}\ /^\?\?/ {next}\ {++n}\ END {print n}\ @@ -284,12 +284,12 @@ _update-version: $(sed) -e 's/^[^.]\{1,\}\.[^.]\{1,\}\.\([^.-]\{1,\}\).*/\1/'`";\ [ "$${vupd}" = "$${VERSION}" ] && VERSION="$${VERSION}.0" vupd=0;\ trap "$(rm) ./version.tmp" 0 1 2 15;\ - printf > ./version.tmp "#define VERSION \"v$${VERSION}\"\n";\ - printf >> ./version.tmp "#define VERSION_MAJOR \"$${vmaj}\"\n";\ - printf >> ./version.tmp "#define VERSION_MINOR \"$${vmin}\"\n";\ - printf >> ./version.tmp "#define VERSION_UPDATE \"$${vupd}\"\n";\ - $(cmp) ./version.tmp ./version.h >/dev/null 2>&1 && exit;\ - $(mv) ./version.tmp ./version.h;\ + printf > ./version.tmp "#define n_VERSION \"v$${VERSION}\"\n";\ + printf >> ./version.tmp "#define n_VERSION_MAJOR \"$${vmaj}\"\n";\ + printf >> ./version.tmp "#define n_VERSION_MINOR \"$${vmin}\"\n";\ + printf >> ./version.tmp "#define n_VERSION_UPDATE \"$${vupd}\"\n";\ + $(cmp) ./version.tmp ./gen-version.h >/dev/null 2>&1 && exit;\ + $(mv) ./version.tmp ./gen-version.h;\ trap : 0 1 2 15 # s-mk-mode diff --git a/mk-okey-map.pl b/mk-okey-map.pl index e449a3d6..b25a245f 100755 --- a/mk-okey-map.pl +++ b/mk-okey-map.pl @@ -1,7 +1,7 @@ #!/usr/bin/env perl require 5.008_001; use utf8; -#@ Parse 'enum okeys' from nail.h and create okeys.h. And see accmacvar.c. +#@ Parse 'enum okeys' from nail.h and create gen-okeys.h. And see accmacvar.c. # Public Domain # Acceptable "longest distance" from hash-modulo-index to key @@ -10,7 +10,7 @@ my $MAXDISTANCE_PENALTY = 5; # Generate a more verbose output. Not for shipout versions. my $VERB = 1; -my $OUT = 'okeys.h'; +my $OUT = 'gen-okeys.h'; ## -- >8 -- 8< -- ## @@ -157,7 +157,7 @@ torek_hash(char const *name){ #else /* Include what has been written in HASH_MODE */ # define n_CTA(A,S) -# include "okeys.h" +# include "gen-okeys.h" static ui8_t seen_wraparound; static size_t longest_distance; diff --git a/mk-release.inc b/mk-release.inc index a7c88a8b..322cdf2f 100644 --- a/mk-release.inc +++ b/mk-release.inc @@ -112,9 +112,9 @@ fi ## echo 'Updating stable/ files to match the release' -if [ -f version.h ] && [ -f mk-mk.in ]; then +if [ -f gen-version.h ] && [ -f mk-mk.in ]; then grep=grep sed=sed cmp=cmp mv=mv make -f mk-mk.in _update-version - git add version.h + git add gen-version.h fi update_stable_hook diff --git a/mk-release.sh b/mk-release.sh index 44d8e974..6d3a4907 100644 --- a/mk-release.sh +++ b/mk-release.sh @@ -64,8 +64,8 @@ update_stable_hook() { git add nail.rc fi - [ -f ./mk-okey-map.pl ] && ./mk-okey-map.pl && git add okeys.h - [ -f ./mk-tcap-map.pl ] && ./mk-tcap-map.pl && git add tcaps.h + [ -f ./mk-okey-map.pl ] && ./mk-okey-map.pl && git add gen-okeys.h + [ -f ./mk-tcap-map.pl ] && ./mk-tcap-map.pl && git add gen-tcaps.h } update_release_hook() { @@ -90,8 +90,8 @@ update_release_hook() { git add nail.rc fi - [ -f ./mk-okey-map.pl ] && ./mk-okey-map.pl noverbose && git add okeys.h - [ -f ./mk-tcap-map.pl ] && ./mk-tcap-map.pl noverbose && git add tcaps.h + [ -f ./mk-okey-map.pl ] && ./mk-okey-map.pl noverbose && git add gen-okeys.h + [ -f ./mk-tcap-map.pl ] && ./mk-tcap-map.pl noverbose && git add gen-tcaps.h } . ./mk-release.inc diff --git a/mk-tcap-map.pl b/mk-tcap-map.pl index b9981622..4f88f164 100755 --- a/mk-tcap-map.pl +++ b/mk-tcap-map.pl @@ -1,11 +1,11 @@ #!/usr/bin/env perl require 5.008_001; use utf8; -#@ Parse 'enum n_termcap_{cmd,query}' from nail.h and create tcaps.h. +#@ Parse 'enum n_termcap_{cmd,query}' from nail.h and create gen-tcaps.h. #@ And see termcap.c. # Public Domain -my $OUT = 'tcaps.h'; +my $OUT = 'gen-tcaps.h'; # Generate a more verbose output. Not for shipout versions. my $VERB = 1; diff --git a/nail.h b/nail.h index cb5dad7f..0d9bf89c 100644 --- a/nail.h +++ b/nail.h @@ -1832,10 +1832,10 @@ ok_b_ssl_no_default_ca, ok_v_VISUAL, /* {env=1,defval=VAL_VISUAL} */ ok_b_v15_compat, ok_b_verbose, /* {vip=1} */ - ok_v_version, /* {virt=VERSION} */ - ok_v_version_major, /* {virt=VERSION_MAJOR} */ - ok_v_version_minor, /* {virt=VERSION_MINOR} */ - ok_v_version_update, /* {virt=VERSION_UPDATE} */ + ok_v_version, /* {virt=n_VERSION} */ + ok_v_version_major, /* {virt=n_VERSION_MAJOR} */ + ok_v_version_minor, /* {virt=n_VERSION_MINOR} */ + ok_v_version_update, /* {virt=n_VERSION_UPDATE} */ ok_b_writebackedited }; diff --git a/nailfuns.h b/nailfuns.h index 9ca06854..90e8e7ea 100644 --- a/nailfuns.h +++ b/nailfuns.h @@ -412,7 +412,7 @@ FL char const *n_regex_err_to_str(const regex_t *rep, int e); #endif /* - * cmd_arg.c + * cmd-arg.c */ /* Scan out the list of string arguments according to rm, return -1 on error; @@ -431,7 +431,7 @@ FL struct n_string *n_cmd_arg_join_greedy(struct n_cmd_arg_ctx const *cacp, struct n_string *store); /* - * cmd_cnd.c + * cmd-cnd.c */ /* if.elif.else.endif conditional execution. @@ -449,7 +449,7 @@ FL void *condstack_release(void); FL bool_t condstack_take(void *self); /* - * cmd_folder.c + * cmd-folder.c */ /* `file' (`folder') and `File' (`Folder') */ @@ -472,7 +472,7 @@ FL int c_rename(void *v); FL int c_folders(void *v); /* - * cmd_headers.c + * cmd-headers.c */ /* `headers' (show header group, possibly after setting dot) */ @@ -496,7 +496,7 @@ FL int c_from(void *v); FL void print_headers(size_t bottom, size_t topx, bool_t only_marked); /* - * cmd_message.c + * cmd-message.c */ /* Paginate messages, honour/don't honour ignored fields, respectively */ @@ -562,7 +562,7 @@ FL int c_draft(void *v); FL int c_undraft(void *v); /* - * cmd_misc.c + * cmd-misc.c */ /* Process a shell escape by saving signals, ignoring signals and a sh -c */ @@ -584,7 +584,7 @@ FL int c_echon(void *v); FL int c_echoerrn(void *v); /* - * cmd_resend.c + * cmd-resend.c */ /* All thinkable sorts of `reply' / `respond' and `followup'.. */ @@ -614,7 +614,7 @@ FL int c_resend(void *v); FL int c_Resend(void *v); /* - * cmd_write.c + * cmd-write.c */ /* Save a message in a file. Mark the message as saved so we can discard when @@ -1022,7 +1022,7 @@ FL bool_t n_ignore_lookup(struct n_ignore const *self, (n_ignore_lookup(SELF, FDAT, FLEN) == TRUM1) /* - * imap_search.c + * imap-search.c */ /* Return -1 on invalid spec etc., the number of matches otherwise */ @@ -1031,7 +1031,7 @@ FL ssize_t imap_search(char const *spec, int f); #endif /* - * lex_input.c + * lex-input.c */ /* Fallback implementation for commands which are unavailable in this config */ @@ -1308,7 +1308,7 @@ FL ssize_t xmime_write(char const *ptr, size_t size, /* TODO LEGACY */ FILE *f, enum conversion convert, enum tdflags dflags); /* - * mime_enc.c + * mime-enc.c * Content-Transfer-Encodings as defined in RFC 2045 (and RFC 2047): * - Quoted-Printable, section 6.7 * - Base64, section 6.8 @@ -1392,7 +1392,7 @@ FL bool_t b64_decode_part(struct str *out, struct str const *in, struct str *outrest, struct str *inrest_or_null); /* - * mime_param.c + * mime-param.c */ /* Get a mime style parameter from a header body */ @@ -1415,7 +1415,7 @@ FL char * mime_param_boundary_get(char const *headerbody, size_t *len); FL char * mime_param_boundary_create(void); /* - * mime_parse.c + * mime-parse.c */ /* Create MIME part object tree for and of mp */ @@ -1423,7 +1423,7 @@ FL struct mimepart * mime_parse_msg(struct message *mp, enum mime_parse_flags mpf); /* - * mime_types.c + * mime-types.c */ /* `(un)?mimetype' commands */ @@ -1452,7 +1452,7 @@ FL enum mime_handler_flags mime_type_handler(struct mime_handler *mhp, enum sendaction action); /* - * nam_a_grp.c + * nam-a-grp.c */ /* Allocate a single element of a name list, initialize its name field to the @@ -2437,7 +2437,7 @@ FL int c_unbind(void *v); #endif /* - * ui_str.c + * ui-str.c */ /* Parse (onechar of) a given buffer, and generate infos along the way. diff --git a/nam_a_grp.c b/nam-a-grp.c similarity index 100% rename from nam_a_grp.c rename to nam-a-grp.c diff --git a/smtp_gssapi.h b/smtp-gssapi.h similarity index 100% rename from smtp_gssapi.h rename to smtp-gssapi.h diff --git a/smtp.c b/smtp.c index 84fc9af2..98767f7f 100644 --- a/smtp.c +++ b/smtp.c @@ -322,7 +322,7 @@ jleave: } #ifdef HAVE_GSSAPI -# include "smtp_gssapi.h" +# include "smtp-gssapi.h" #endif #undef _OUT diff --git a/termcap.c b/termcap.c index 5e18fda3..9e7eed1e 100644 --- a/termcap.c +++ b/termcap.c @@ -124,7 +124,7 @@ struct a_termcap_g{ }; /* Include the constant mk-tcap-map.pl output */ -#include "tcaps.h" +#include "gen-tcaps.h" n_CTA(sizeof a_termcap_namedat <= UI16_MAX, "Termcap command and query name data exceed storage datatype"); n_CTA(a_TERMCAP_ENT_MAX1 == n_NELEM(a_termcap_control), diff --git a/tty.c b/tty.c index c4063566..e12c7e58 100644 --- a/tty.c +++ b/tty.c @@ -4114,7 +4114,7 @@ c_history(void *v){ goto jentry; jerr: n_err(_("Synopsis: history: %s\n"), - /* Same string as in cmd_tab.h, still hoping...) */ + /* Same string as in cmd-tab.h, still hoping...) */ _(" (default), or select from editor history")); v = NULL; jleave: @@ -4186,7 +4186,7 @@ jentry:{ # ifdef HAVE_KEY_BINDINGS FL int c_bind(void *v){ - n_CMD_ARG_DESC_SUBCLASS_DEF(bind, 3, a_tty_bind_cad) { /* TODO cmd_tab.h */ + n_CMD_ARG_DESC_SUBCLASS_DEF(bind, 3, a_tty_bind_cad) { /* TODO cmd-tab.h */ {n_CMD_ARG_DESC_STRING, 0}, {n_CMD_ARG_DESC_WYSH | n_CMD_ARG_DESC_OPTION | n_CMD_ARG_DESC_HONOUR_STOP, @@ -4330,7 +4330,7 @@ jleave: FL int c_unbind(void *v){ - n_CMD_ARG_DESC_SUBCLASS_DEF(unbind, 2, a_tty_unbind_cad) {/* TODO cmd_tab.h*/ + n_CMD_ARG_DESC_SUBCLASS_DEF(unbind, 2, a_tty_unbind_cad) {/* TODO cmd-tab.h*/ {n_CMD_ARG_DESC_STRING, 0}, {n_CMD_ARG_DESC_WYSH | n_CMD_ARG_DESC_HONOUR_STOP, n_SHEXP_PARSE_DRYRUN | n_SHEXP_PARSE_LOG} diff --git a/ui_str.c b/ui-str.c similarity index 100% rename from ui_str.c rename to ui-str.c diff --git a/version.h b/version.h deleted file mode 100644 index 80cfae41..00000000 --- a/version.h +++ /dev/null @@ -1,4 +0,0 @@ -#define VERSION "v14.9.0-pre3" -#define VERSION_MAJOR "14" -#define VERSION_MINOR "9" -#define VERSION_UPDATE "0" -- 2.11.4.GIT