From 62fdaa12ba7d79eed0878ba3cc5003d30d813784 Mon Sep 17 00:00:00 2001 From: Richard Russon Date: Sun, 12 Mar 2017 01:15:02 +0000 Subject: [PATCH] drop control characters from the source Specifically, drop ^L (form feed) --- _regex.h | 12 ++++++------ cryptglue.c | 2 -- intl/COPYING.LIB-2 | 18 ++++++++--------- intl/COPYING.LIB-2.1 | 18 ++++++++--------- intl/l10nflist.c | 4 ++-- intl/plural.c | 6 +++--- mutt_lua.c | 8 ++++---- recvcmd.c | 8 ++++---- regex.c | 46 ++++++++++++++++++++++---------------------- 9 files changed, 60 insertions(+), 62 deletions(-) diff --git a/_regex.h b/_regex.h index 8783c9a25..adfb3b32c 100644 --- a/_regex.h +++ b/_regex.h @@ -165,7 +165,7 @@ typedef unsigned long int reg_syntax_t; stored in the pattern buffer, so changing this does not affect already-compiled regexps. */ extern reg_syntax_t re_syntax_options; - + /* Define combinations of the above bits for the standard possibilities. (The [[[ comments delimit what gets put into the Texinfo file, so don't delete them!) */ @@ -234,7 +234,7 @@ extern reg_syntax_t re_syntax_options; | RE_NO_BK_PARENS | RE_NO_BK_REFS \ | RE_NO_BK_VBAR | RE_UNMATCHED_RIGHT_PAREN_ORD) /* [[[end syntaxes]]] */ - + /* Maximum number of duplicates an interval can allow. Some systems (erroneously) define this in other header files, but we want our value, so remove any previous define. */ @@ -305,7 +305,7 @@ typedef enum REG_ESIZE, /* Compiled pattern bigger than 2^16 bytes. */ REG_ERPAREN /* Unmatched ) or \); not returned from regcomp. */ } reg_errcode_t; - + /* This data structure represents a compiled pattern. Before calling the pattern compiler, the fields `buffer', `allocated', `fastmap', `translate', and `no_sub' can be set. After the pattern has been @@ -385,7 +385,7 @@ struct re_pattern_buffer }; typedef struct re_pattern_buffer regex_t; - + /* Type for byte offsets within the string. POSIX mandates this. */ typedef int regoff_t; @@ -416,7 +416,7 @@ typedef struct regoff_t rm_so; /* Byte offset from string's start to substring's start. */ regoff_t rm_eo; /* Byte offset from string's start to substring's end. */ } regmatch_t; - + /* Declarations for routines. */ /* To avoid duplicating every routine declaration -- once with a @@ -525,7 +525,7 @@ extern void regfree _RE_ARGS ((regex_t *preg)); #endif /* C++ */ #endif /* not __REGEXP_LIBRARY_H__ */ - + /* Local variables: make-backup-files: t diff --git a/cryptglue.c b/cryptglue.c index eeb6979f5..23c782f2c 100644 --- a/cryptglue.c +++ b/cryptglue.c @@ -113,7 +113,6 @@ void crypt_invoke_message (int type) } - /* PGP @@ -269,7 +268,6 @@ void crypt_pgp_set_sender (const char *sender) } - /* diff --git a/intl/COPYING.LIB-2 b/intl/COPYING.LIB-2 index 453e4ed8f..6225a11f0 100644 --- a/intl/COPYING.LIB-2 +++ b/intl/COPYING.LIB-2 @@ -51,7 +51,7 @@ library. If the library is modified by someone else and passed on, we want its recipients to know that what they have is not the original version, so that any problems introduced by others will not reflect on the original authors' reputations. - + Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that companies distributing free software will individually obtain patent licenses, thus in effect @@ -98,7 +98,7 @@ works together with the library. Note that it is possible for a library to be covered by the ordinary General Public License rather than by this special one. - + GNU LIBRARY GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION @@ -145,7 +145,7 @@ Library. You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. - + 2. You may modify your copy or copies of the Library or any portion of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 @@ -203,7 +203,7 @@ instead of to this License. (If a newer version than version 2 of the ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices. - + Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy. @@ -254,7 +254,7 @@ Library will still fall under Section 6.) distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself. - + 6. As an exception to the Sections above, you may also compile or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work @@ -308,7 +308,7 @@ restrictions of other proprietary libraries that do not normally accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute. - + 7. You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined @@ -349,7 +349,7 @@ subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. - + 11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or @@ -401,7 +401,7 @@ conditions either of that version or of any later version published by the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation. - + 14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is @@ -435,7 +435,7 @@ SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS - + Appendix: How to Apply These Terms to Your New Libraries If you develop a new library, and you want it to be of the greatest diff --git a/intl/COPYING.LIB-2.1 b/intl/COPYING.LIB-2.1 index a2a1d92d5..3bb09437a 100644 --- a/intl/COPYING.LIB-2.1 +++ b/intl/COPYING.LIB-2.1 @@ -55,7 +55,7 @@ modified by someone else and passed on, the recipients should know that what they have is not the original version, so that the original author's reputation will not be affected by problems that might be introduced by others. - + Finally, software patents pose a constant threat to the existence of any free program. We wish to make sure that a company cannot effectively restrict the users of a free program by obtaining a @@ -111,7 +111,7 @@ modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The former contains code derived from the library, whereas the latter must be combined with the library in order to run. - + GNU LESSER GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION @@ -158,7 +158,7 @@ Library. You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. - + 2. You may modify your copy or copies of the Library or any portion of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 @@ -216,7 +216,7 @@ instead of to this License. (If a newer version than version 2 of the ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices. - + Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy. @@ -267,7 +267,7 @@ Library will still fall under Section 6.) distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself. - + 6. As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work @@ -329,7 +329,7 @@ restrictions of other proprietary libraries that do not normally accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute. - + 7. You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined @@ -370,7 +370,7 @@ subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties with this License. - + 11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or @@ -422,7 +422,7 @@ conditions either of that version or of any later version published by the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation. - + 14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is @@ -456,7 +456,7 @@ SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS - + How to Apply These Terms to Your New Libraries If you develop a new library, and you want it to be of the greatest diff --git a/intl/l10nflist.c b/intl/l10nflist.c index aca022968..c26993105 100644 --- a/intl/l10nflist.c +++ b/intl/l10nflist.c @@ -160,7 +160,7 @@ pop (x) return x; } - + struct loaded_l10nfile * _nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language, territory, codeset, normalized_codeset, modifier, special, @@ -339,7 +339,7 @@ _nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language, return retval; } - + /* Normalize codeset name. There is no standard for the codeset names. Normalization allows the user to use any of the common names. The return value is dynamically allocated and has to be diff --git a/intl/plural.c b/intl/plural.c index 30059a0fa..1f9f31340 100644 --- a/intl/plural.c +++ b/intl/plural.c @@ -472,7 +472,7 @@ int yydebug; /* nonzero means print parse trace */ #ifndef YYMAXDEPTH #define YYMAXDEPTH 10000 #endif - + /* Define __yy_memcpy. Note that the size argument should be passed with type unsigned int, because that is what the non-GCC definitions require. With GCC, __builtin_memcpy takes an arg @@ -516,7 +516,7 @@ __yy_memcpy (char *to, char *from, unsigned int count) #endif #endif - + #line 217 "/home/haible/gnu/arch/linuxlibc6/share/bison.simple" /* The user can define YYPARSE_PARAM as the name of an argument to be passed @@ -923,7 +923,7 @@ case 12: } /* the action file gets copied in in place of this dollarsign */ #line 543 "/home/haible/gnu/arch/linuxlibc6/share/bison.simple" - + yyvsp -= yylen; yyssp -= yylen; #ifdef YYLSP_NEEDED diff --git a/mutt_lua.c b/mutt_lua.c index ea2e48eaf..e5b35ce3d 100644 --- a/mutt_lua.c +++ b/mutt_lua.c @@ -183,7 +183,7 @@ static int _lua_mutt_set(lua_State *l) } else { - mutt_debug(2, " * _lua_mutt_get(%s) → error\n", param); + mutt_debug(2, " * _lua_mutt_get(%s) -> error\n", param); luaL_error(l, "Mutt parameter not found %s", param); rv = -1; } @@ -255,7 +255,7 @@ static int _lua_mutt_get(lua_State *l) luaL_error(l, "Mutt parameter type %d unknown for %s", opt->type, param); return -1; } - mutt_debug(2, " * _lua_mutt_get() → error"); + mutt_debug(2, " * _lua_mutt_get() -> error"); luaL_error(l, "Mutt parameter not found %s", param); return -1; } @@ -386,13 +386,13 @@ int mutt_lua_parse(BUFFER *tmp, BUFFER *s, unsigned long data, BUFFER *err) if (luaL_dostring(Lua, s->dptr)) { - mutt_debug(2, " * mutt_lua_parse(%s) → failure\n", s->dptr); + mutt_debug(2, " * mutt_lua_parse(%s) -> failure\n", s->dptr); snprintf(err->data, err->dsize, _("%s: %s"), s->dptr, lua_tostring(Lua, -1)); /* pop error message from the stack */ lua_pop(Lua, 1); return -1; } - mutt_debug(2, " * mutt_lua_parse(%s) → success\n", s->dptr); + mutt_debug(2, " * mutt_lua_parse(%s) -> success\n", s->dptr); return 2; } diff --git a/recvcmd.c b/recvcmd.c index 74d01632e..bf2b70358 100644 --- a/recvcmd.c +++ b/recvcmd.c @@ -115,7 +115,7 @@ static short count_tagged_children (ATTACHPTR ** idx, } - + /** ** ** The bounce function, from the attachment menu @@ -242,7 +242,7 @@ void mutt_attach_bounce (FILE * fp, HEADER * hdr, } - + /** ** ** resend-message, from the attachment menu @@ -268,7 +268,7 @@ void mutt_attach_resend (FILE * fp, HEADER * hdr, ATTACHPTR ** idx, } } - + /** ** ** forward-message, from the attachment menu @@ -701,7 +701,7 @@ void mutt_attach_forward (FILE * fp, HEADER * hdr, } - + /** ** ** the various reply functions, from the attachment menu diff --git a/regex.c b/regex.c index 364e9d249..9ee1cfecf 100644 --- a/regex.c +++ b/regex.c @@ -207,7 +207,7 @@ init_syntax_once () #define SYNTAX(c) re_syntax_table[c] #endif /* not emacs */ - + /* Get the interface, including the syntax bits. */ /* Changed to fit into mutt - tlr, 1999-01-06 */ @@ -271,7 +271,7 @@ init_syntax_once () /* As in Harbison and Steele. */ #define SIGN_EXTEND_CHAR(c) ((((unsigned char) (c)) ^ 128) - 128) #endif - + /* Should we use malloc or alloca? If REGEX_MALLOC is not defined, we use `alloca' instead of `malloc'. This is because using malloc in re_search* or re_match* could cause memory leaks when C-g is used in @@ -384,7 +384,7 @@ typedef char boolean; static int re_match_2_internal (struct re_pattern_buffer *bufp, const char *string1, int size1, const char *string2, int size2, int pos, struct re_registers *regs, int stop); - + /* These are the command codes that appear in compiled regular expressions. Some opcodes are followed by argument bytes. A command code can specify any interpretation whatsoever for its @@ -523,7 +523,7 @@ typedef enum notsyntaxspec #endif /* emacs */ } re_opcode_t; - + /* Common operations on the compiled pattern. */ /* Store NUMBER in two contiguous bytes starting at DESTINATION. */ @@ -600,7 +600,7 @@ extract_number_and_incr (destination, source) #endif /* not EXTRACT_MACROS */ #endif /* DEBUG */ - + /* If DEBUG is defined, Regex prints many voluminous messages about what it is doing (if the variable `debug' is nonzero). If linked with the main program in `iregex.c', you can enter patterns and strings @@ -973,7 +973,7 @@ printchar (c) #define DEBUG_PRINT_DOUBLE_STRING(w, s1, sz1, s2, sz2) #endif /* not DEBUG */ - + /* Set by `re_set_syntax' to the current regexp syntax to recognize. Can also be assigned to arbitrarily: each pattern buffer stores its own syntax, so it can be changed between regex compilations. */ @@ -1004,7 +1004,7 @@ re_set_syntax (syntax) #endif /* DEBUG */ return ret; } - + /* This table gives an error message for each of the error codes listed in regex.h. Obviously the order here has to be same as there. POSIX doesn't require that we do anything for REG_NOERROR, @@ -1030,7 +1030,7 @@ static const char *re_error_msgid[] = gettext_noop ("Regular expression too big"), /* REG_ESIZE */ gettext_noop ("Unmatched ) or \\)"), /* REG_ERPAREN */ }; - + /* Avoiding alloca during matching, to placate r_alloc. */ /* Define MATCH_MAY_ALLOCATE unless we need to make sure that the @@ -1068,7 +1068,7 @@ static const char *re_error_msgid[] = #undef MATCH_MAY_ALLOCATE #endif - + /* Failure stack declarations and macros; both re_compile_fastmap and re_match_2 use a failure stack. These have to be macros because of REGEX_ALLOCATE_STACK. */ @@ -1432,7 +1432,7 @@ typedef struct } /* POP_FAILURE_POINT */ - + /* Structure for per-register (a.k.a. per-group) information. Other register information, such as the starting and ending positions (which are addresses), and the list of @@ -1492,7 +1492,7 @@ typedef union static char reg_unset_dummy; #define REG_UNSET_VALUE (®_unset_dummy) #define REG_UNSET(e) ((e) == REG_UNSET_VALUE) - + /* Subroutine declarations and macros for regex_compile. */ static reg_errcode_t regex_compile _RE_ARGS ((const char *pattern, size_t size, @@ -1742,7 +1742,7 @@ typedef struct || STREQ (string, "punct") || STREQ (string, "graph") \ || STREQ (string, "cntrl") || STREQ (string, "blank")) #endif - + #ifndef MATCH_MAY_ALLOCATE /* If we cannot allocate large objects within re_match_2_internal, @@ -1790,7 +1790,7 @@ regex_grow_registers (num_regs) } #endif /* not MATCH_MAY_ALLOCATE */ - + static boolean group_in_compile_stack _RE_ARGS ((compile_stack_type compile_stack, regnum_t regnum)); @@ -2915,7 +2915,7 @@ regex_compile (pattern, size, syntax, bufp) return REG_NOERROR; } /* regex_compile */ - + /* Subroutines for `regex_compile'. */ /* Store OP at LOC followed by two-byte integer parameter ARG. */ @@ -3102,7 +3102,7 @@ compile_range (p_ptr, pend, translate, syntax, b) return REG_NOERROR; } - + /* re_compile_fastmap computes a ``fastmap'' for the compiled pattern in BUFP. A fastmap records which of the (1 << BYTEWIDTH) possible characters can start a string that matches the pattern. This fastmap @@ -3404,7 +3404,7 @@ re_compile_fastmap (bufp) RESET_FAIL_STACK (); return 0; } /* re_compile_fastmap */ - + /* Set REGS to hold NUM_REGS registers, storing them in STARTS and ENDS. Subsequent matches using PATTERN_BUFFER and REGS will use this memory for recording register information. STARTS and ENDS @@ -3439,7 +3439,7 @@ re_set_registers (bufp, regs, num_regs, starts, ends) regs->start = regs->end = (regoff_t *) 0; } } - + /* Searching routines. */ /* Like re_search_2, below, but only one string is specified, and @@ -3611,7 +3611,7 @@ re_search_2 (bufp, string1, size1, string2, size2, startpos, range, regs, stop) } return -1; } /* re_search_2 */ - + /* This converts PTR, a pointer into one of the search strings `string1' and `string2' into an offset from the beginning of that string. */ #define POINTER_TO_OFFSET(ptr) \ @@ -3690,7 +3690,7 @@ re_search_2 (bufp, string1, size1, string2, size2, startpos, range, regs, stop) to actually save any registers when none are active. */ #define NO_HIGHEST_ACTIVE_REG (1 << BYTEWIDTH) #define NO_LOWEST_ACTIVE_REG (NO_HIGHEST_ACTIVE_REG + 1) - + /* Matching routines. */ #ifndef emacs /* Emacs never uses this. */ @@ -5151,7 +5151,7 @@ re_match_2_internal (bufp, string1, size1, string2, size2, pos, regs, stop) return -1; /* Failure to match. */ } /* re_match_2 */ - + /* Subroutine definitions for re_match_2. */ @@ -5414,7 +5414,7 @@ bcmp_translate (s1, s2, len, translate) } return 0; } - + /* Entry points for GNU code. */ /* re_compile_pattern is the GNU regular expression compiler: it @@ -5452,7 +5452,7 @@ re_compile_pattern (pattern, length, bufp) return NULL; return gettext (re_error_msgid[(int) ret]); } - + /* Entry points compatible with 4.2 BSD regex library. We don't define them unless specifically requested. */ @@ -5521,7 +5521,7 @@ re_exec (s) } #endif /* _REGEX_RE_COMP */ - + /* POSIX.2 functions. Don't define these for Emacs. */ #ifndef emacs -- 2.40.0