2008-04-11 Simon Josefsson <simon@josefsson.org>
* lib/gc-gnulib.c: On Windows, use CryptGenRandom from CSP instead
- of attempting to use non-existing /dev/*random. Based on patch
+ of attempting to use nonexistent /dev/*random. Based on patch
from Adam Strzelecki <ono@java.pl> in
<http://lists.gnu.org/r/help-gsasl/2008-02/msg00000.html>.
# Also exclude doc/INSTALL*, since they too are generated.
# Also adjust template-style files that must start with a single
# (the current) year number in some places.
-# Also adjust version-etc.c and and gendocs.sh.
+# Also adjust version-etc.c and gendocs.sh.
update-copyright:
export TZ='$(COPYRIGHT_TZ)'; \
exempt=$$(mktemp); \
<https://lists.gnu.org/r/bug-gnulib/2010-10/msg00291.html>
<https://lists.gnu.org/r/bug-gnulib/2010-10/msg00308.html
-3) iconv_open's file file list
+3) iconv_open's file list
<https://lists.gnu.org/r/bug-gnulib/2010-10/msg00282.html>
Discussion:
# Handle the still-experimental Automake-NG programs specially.
# They remain named as the mainstream Automake programs ("automake",
# and "aclocal") to avoid gratuitous incompatibilities with
- # pre-existing usages (by, say, autoreconf, or custom autogen.sh
+ # preexisting usages (by, say, autoreconf, or custom autogen.sh
# scripts), but correctly identify themselves (as being part of
# "GNU automake-ng") when asked their version.
case $app in
class is below and it specifies the properties that the project must set to
ensure correct parsing of its contents.
-Among other things, ProjectQurks specifies the VCS to read from; the default is
+Among other things, ProjectQuirks specifies the VCS to read from; the default is
assumed to be git. The script then studies the VCS log and for each change,
list out the nature of changes in the constituent files.
Each file type may have parser frontends that can read files and construct
-objects that may be compared to determine the minimal changes that occured in
+objects that may be compared to determine the minimal changes that occurred in
each revision. For files that do not have parsers, we may only know the nature
of changes at the top level depending on the information that the VCS stores.
if 'typedef' in cur:
name = re.sub(r'.*}\s*(\w+);$', r'\1', cur)
else:
- name= '<anoymous>'
+ name= '<anonymous>'
ctype = found.group(1)
''' Parse a preprocessor directive.
In case a preprocessor condition (i.e. if/elif/else), create a new code
- block to nest code into and in other cases, identify and add entities suchas
+ block to nest code into and in other cases, identify and add entities such as
include files, defines, etc.
- OP is the string array for the file
def consolidate_tree_blocks(self, tree):
''' Consolidate common macro conditional blocks.
- Get macro conditional blocks at the same level but scatterred across the
+ Get macro conditional blocks at the same level but scattered across the
file together into a single common block to allow for better comparison.
'''
# Nothing to do for non-nesting blocks.
mechanism the maintainer applies to the sources. For these reasons,
this option is generally discouraged.
-@code{gnulib-tool} will overwrite any pre-existing files, in
+@code{gnulib-tool} will overwrite any preexisting files, in
particular @file{Makefile.am}. It is also possible to separate the
generated @file{Makefile.am} content (for building the gnulib library)
into a separate file, say @file{gnulib.mk}, that can be included by your
AIX with gcc or xlclang.
@end itemize
@noindent
-It is not supprted on
+It is not supported on
@itemize @bullet
@item
Other compilers on ELF platforms or AIX,
@file{foo-1.0.tar.gz} and @file{foo-1.0.tar.gz.sig} will be placed in the
directory @file{gnu/bar/v1} of the @code{ftp.gnu.org} site.
-The directive file can be used to create currently non-existent
+The directive file can be used to create currently nonexistent
directory trees, as long as they are under the package directory for
your package (in the example above, that is @code{bar}).
images is still not recommended, as the PNG and JPEG formats are
generally superior. See @url{https://www.gnu.org/philosophy/gif.html}.
-Please make sure that any Javascript code in your web pages is covered
+Please make sure that any JavaScript code in your web pages is covered
by a free license, and has its license indicated in a way LibreJS can
recognize. See @url{https://gnu.org/philosophy/javascript-trap.html}.
-If the Javascript in the page is minified, or for any other reason is
+If the JavaScript in the page is minified, or for any other reason is
not the source code, it must point to its source code as described
there.
@itemize
@item
The Gnulib module @code{alignalloc} provides a portable function
-@code{alignalloc} that is a near-substitute for for glibc
+@code{alignalloc} that is a near-substitute for glibc
@code{aligned_alloc}, except that the result must be freed
with @code{alignfree} rather than plain @code{free}.
typically write the timestamp into static buffer. If two threads
call @code{ctime} at roughly the same time, you might end up with the
wrong date in one of the threads, or some undefined string. There is
-a re-entrant interface @code{ctime_r}.
+a reentrant interface @code{ctime_r}.
@item
Native Windows platforms (mingw, MSVC) support only a subset of time
zones supported by GNU or specified by POSIX@. @xref{tzset}.
incomplete multibyte character on some platforms:
AIX 7.2.
@item
-This function stores a wide character when when parsing an incomplete multibyte
+This function stores a wide character when parsing an incomplete multibyte
character on some platforms:
MSVC 14.
@item
A web page recommends a program in an implicit but particularly strong
way if it requires users to run that program in order to use the page.
-Many pages contain Javascript code which they recommend in this way.
-This Javascript code may be free or non-free, but non-free is the usual
+Many pages contain JavaScript code which they recommend in this way.
+This JavaScript code may be free or non-free, but non-free is the usual
case.
If the purpose for which you would refer to the page cannot be carried
-out without running non-free Javascript code, then you should not refer
+out without running non-free JavaScript code, then you should not refer
to it. Thus, if the purpose of referring to the page is for people to
view a video, or subscribing to a mailing list, and the viewing or
subscribing fail to work if the user's browser blocks the non-free
-Javascript code, then don't refer to that page.
+JavaScript code, then don't refer to that page.
The extreme case is that of web sites which depend on non-free
-Javascript code even to @emph{see} the contents of the pages. Any
+JavaScript code even to @emph{see} the contents of the pages. Any
site hosted on @indicateurl{wix.com} has this problem, and so do some
other sites. Referring people to such pages to read their contents
is, in effect, urging them to run those non-free programs---so please
/* LONG_OPTS is the array of getop long option structures for the union of
all the groups of options. */
struct option *long_opts;
- /* OPT_DATA is the getopt data used for the re-entrant getopt. */
+ /* OPT_DATA is the getopt data used for the reentrant getopt. */
struct _getopt_data opt_data;
/* States of the various parsing groups. */
unknown option is present, ARGP_ERR_UNKNOWN is returned; if some parser
routine returned a non-zero value, it is returned; otherwise 0 is
returned. This function may also call exit unless the ARGP_NO_HELP flag
- is set. INPUT is a pointer to a value to be passed in to the parser. */
+ is set. INPUT is a pointer to a value to be passed into the parser. */
extern error_t argp_parse (const struct argp *__restrict __argp,
int /*argc*/, char **__restrict /*argv*/,
unsigned __flags, int *__restrict __arg_index,
/* Disable bitset stats gathering. */
void bitset_stats_disable (void);
-/* Read bitset stats file of accummulated stats. */
+/* Read bitset stats file of accumulated stats. */
void bitset_stats_read (const char *file_name);
-/* Write bitset stats file of accummulated stats. */
+/* Write bitset stats file of accumulated stats. */
void bitset_stats_write (const char *file_name);
/* Dump bitset stats. */
* unsigned char key[8];
* unsigned char plaintext[8];
* unsigned char ciphertext[8];
- * unsigned char recoverd[8];
+ * unsigned char recovered[8];
* gl_des_ctx context;
*
* // Fill 'key' and 'plaintext' with some data
* des_ecb_encrypt(&context, plaintext, ciphertext);
*
* // To recover the original plaintext from ciphertext use:
- * des_ecb_decrypt(&context, ciphertext, recoverd);
+ * des_ecb_decrypt(&context, ciphertext, recovered);
*
*
* Triple-DES Example
* unsigned char key3[8];
* unsigned char plaintext[8];
* unsigned char ciphertext[8];
- * unsigned char recoverd[8];
+ * unsigned char recovered[8];
* gl_3des_ctx context;
*
- * // If you would like to use two 64bit keys, fill 'key1' and'key2'
+ * // If you would like to use two 64bit keys, fill 'key1' and 'key2'
* // then setup the encryption context:
* gl_3des_set2keys(&context, key1, key2);
*
* gl_3des_ecb_encrypt(&context, plaintext, ciphertext);
*
* // Decrypting ciphertext to recover the plaintext with Triple-DES
- * gl_3des_ecb_decrypt(&context, ciphertext, recoverd);
+ * gl_3des_ecb_decrypt(&context, ciphertext, recovered);
*/
/* Multibyte character handling sub-routines for dfaexec. */
/* Consume a single byte and transit state from 's' to '*next_state'.
- This function is almost same as the state transition routin in dfaexec.
- But state transition is done just once, otherwise matching succeed or
- reach the end of the buffer. */
+ This is almost the same as the state transition routine in dfaexec.
+ But the state transition is done just once; otherwise, matching succeeds or
+ we reach the end of the buffer. */
static state_num
transit_state_singlebyte (struct dfa *d, state_num s, unsigned char const **pp)
{
/* This function serves as replacement for a missing fchownat function,
- as well as a work around for the fchownat bug in glibc-2.4:
+ as well as a workaround for the fchownat bug in glibc-2.4:
<https://lists.ubuntu.com/archives/ubuntu-users/2006-September/093218.html>
when the buggy fchownat-with-AT_SYMLINK_NOFOLLOW operates on a symlink, it
mistakenly affects the symlink referent, rather than the symlink itself.
/*
* If doing a logical walk, or application requested FTS_FOLLOW, do
- * a stat(2). If that fails, check for a non-existent symlink. If
+ * a stat(2). If that fails, check for a nonexistent symlink. If
* fail, set the errno from the stat call.
*/
int flags = follow ? 0 : AT_SYMLINK_NOFOLLOW;
_GL_ATTRIBUTE_RETURNS_NONNULL;
/* Make all buckets empty, placing any chained entries on the free list.
- Apply the user-specified function data_freer (if any) to the datas of any
+ Apply the user-specified function data_freer (if any) to the data of any
affected entries. */
extern void hash_clear (Hash_table *table);
t1 = memory;
t2 = memory + t1len + 1;
- /* Csae-fold the two argument strings. */
+ /* Case-fold the two argument strings. */
if (MB_CUR_MAX > 1)
{
t1len = apply_towlower (s1, s1len, t1, t1len);
date: normalized time: '(Y-M-D) 2006-04-02 03:45:00'
date: __
date: possible reasons:
- date: non-existing due to daylight-saving time;
+ date: nonexistent due to daylight-saving time;
date: numeric values overflow;
date: missing timezone;
*/
dbg_printf (_(" possible reasons:\n"));
if (dst_shift)
- dbg_printf (_(" non-existing due to daylight-saving time;\n"));
+ dbg_printf (_(" nonexistent due to daylight-saving time;\n"));
if (!eq_mday && !eq_month)
dbg_printf (_(" invalid day/month combination;\n"));
dbg_printf (_(" numeric values overflow;\n"));
bitset_word_t bits3 = 0x07fffffe;
if (BITSET_WORD_BITS == 64)
{
- /* Pacify gcc -Woverflow on 32-bit platformns. */
+ /* Pacify gcc -Woverflow on 32-bit platforms. */
dfa->word_char[0] = bits1 << 31 << 1 | bits0;
dfa->word_char[1] = bits3 << 31 << 1 | bits2;
i = 2;
# if (RENAME_TRAILING_SLASH_SOURCE_BUG || RENAME_DEST_EXISTS_BUG \
|| RENAME_HARD_LINK_BUG)
/* If the only bug was that a trailing slash was allowed on a
- non-existing file destination, as in Solaris 10, then we've
+ nonexistent file destination, as in Solaris 10, then we've
already covered that situation. But if there is any problem with
a trailing slash on an existing source or destination, as in
Solaris 9, or if a directory can overwrite a symlink, as on
For LC_COLLATE, the application should use the locale
properties kCFLocaleCollationIdentifier,
kCFLocaleCollatorIdentifier.
- For LC_MONETARY, the applicationshould use the locale
+ For LC_MONETARY, the application should use the locale
properties kCFLocaleCurrencySymbol,
kCFLocaleCurrencyCode.
But since most applications don't have macOS specific
* Installs a stack overflow handler.
* The extra_stack argument is a pointer to a pre-allocated area used as a
* stack for executing the handler. It typically comes from a static variable
- * or from heap-allocated memoty; placing it on the main stack may fail on
+ * or from heap-allocated memory; placing it on the main stack may fail on
* some operating systems.
* Its size, passed in extra_stack_size, should be sufficiently large. The
* following code determines an appropriate size:
- On all platforms, if some other thread is doing memory allocations or
deallocations between two read() calls, there is a high risk that the
result of these two read() calls don't fit together, and as a
- consequence we will parse gargage and either omit some VMAs or return
+ consequence we will parse garbage and either omit some VMAs or return
VMAs with nonsensical addresses.
So use mmap(), and ignore the resulting VMA.
The stack-allocated buffer cannot be too large, because this can be called
{
uintptr_t address;
struct vma_struct *vma;
- /* The stack appears as multiple adjacents segments, therefore we
+ /* The stack appears as multiple adjacent segments, therefore we
merge adjacent segments. */
uintptr_t curr_start, curr_end;
# if STACK_DIRECTION < 0
{
uintptr_t address;
struct vma_struct *vma;
- /* The stack appears as multiple adjacents segments, therefore we
+ /* The stack appears as multiple adjacent segments, therefore we
merge adjacent segments. */
uintptr_t curr_start, curr_end;
# if STACK_DIRECTION < 0
{
uintptr_t address;
struct vma_struct *vma;
- /* The stack appears as three adjacents segments, therefore we
+ /* The stack appears as three adjacent segments, therefore we
merge adjacent segments. */
uintptr_t curr_start, curr_end;
# if STACK_DIRECTION < 0
# define LOCK_EX 2 /* Exclusive lock. */
# define LOCK_UN 8 /* Unlock. */
-/* Can be OR'd in to one of the above. */
+/* Can be OR'd into one of the above. */
# define LOCK_NB 4 /* Don't block when locking. */
#endif
system.
Timing variables are defined using the DEFTIMEVAR macro in
- timevar.def. Each has an enumeral identifier, used when referring
+ timevar.def. Each has an identifier of type timevar_id_t, used to refer
to the timing variable in code, and a character string name.
Timing variables can be used in two ways:
#endif
-/* Return the length of the initial segmet of WCS which consists entirely
+/* Return the length of the initial segment of WCS which consists entirely
of wide characters not in REJECT. */
#if @GNULIB_WCSCSPN@
# if !@HAVE_WCSCSPN@
#endif
-/* Return the length of the initial segmet of WCS which consists entirely
+/* Return the length of the initial segment of WCS which consists entirely
of wide characters in ACCEPT. */
#if @GNULIB_WCSSPN@
# if !@HAVE_WCSSPN@
# Check for SunOS statfs brokenness wrt partitions 2GB and larger.
# If <sys/vfs.h> exists and struct statfs has a member named f_spare,
-# enable the work-around code in fsusage.c.
+# enable the workaround code in fsusage.c.
AC_DEFUN([gl_STATFS_TRUNCATES],
[
AC_CACHE_CHECK([for statfs that truncates block counts],
additional_libdir3=
fi
dnl Search the library and its dependencies in $additional_libdir and
- dnl $LDFLAGS. Using breadth-first-seach.
+ dnl $LDFLAGS. Use breadth-first search.
LIB[]NAME=
LTLIB[]NAME=
INC[]NAME=
Description:
-c_vsnprintf(): print formatted output from an stdarg argument listto a
+c_vsnprintf(): print formatted output from an stdarg argument list to a
fixed length string in C locale
Files:
% type(file).__name__)
def getFiles(self):
- '''Return the list of the fileed files.'''
+ '''Return the list of files.'''
return list(self.table['files'])
def setFiles(self, files):
raise GLError(10, None)
# Define GLImport attributes.
- self.emiter = GLEmiter(self.config)
+ self.emitter = GLEmiter(self.config)
self.filesystem = GLFileSystem(self.config)
self.modulesystem = GLModuleSystem(self.config)
self.moduletable = GLModuleTable(self.config,
modules = [ str(module)
for module in moduletable['base'] ]
avoids = self.config['avoids']
- emit += self.emiter.copyright_notice()
+ emit += self.emitter.copyright_notice()
emit += '''#
# This file represents the specification of how gnulib-tool is used.
# It acts as a cache: It is written and read by gnulib-tool.
modules = [ str(module)
for module in moduletable['base'] ]
emit += '# DO NOT EDIT! GENERATED AUTOMATICALLY!\n'
- emit += self.emiter.copyright_notice()
+ emit += self.emitter.copyright_notice()
emit += '''#
# This file represents the compiled summary of the specification in
# gnulib-cache.m4. It lists the computed macro invocations that need
m4_pattern_allow([^gl_ES$])dnl a valid locale name
m4_pattern_allow([^gl_LIBOBJS$])dnl a variable
m4_pattern_allow([^gl_LTLIBOBJS$])dnl a variable\n''' % (configure_ac, macro_prefix)
- emit += self.emiter.preEarlyMacros(True, ' ', moduletable['final'])
+ emit += self.emitter.preEarlyMacros(True, ' ', moduletable['final'])
uses_subdirs = False
for module in moduletable['main']:
# Test whether there are some source files in subdirectories.
if auxdir != 'build-aux':
replace_auxdir = True
emit += ' gl_m4_base=\'%s\'\n' % m4base
- emit += self.emiter.initmacro_start(macro_prefix)
+ emit += self.emitter.initmacro_start(macro_prefix)
emit += ' gl_source_base=\'%s\'\n' % sourcebase
if witness_c_macro:
emit += ' m4_pushdef([gl_MODULE_INDICATOR_CONDITION], [%s])\n' % witness_c_macro
# Emit main autoconf snippets.
- emit += self.emiter.autoconfSnippets(moduletable['main'],
- moduletable, 0, True, False, True, replace_auxdir)
+ emit += self.emitter.autoconfSnippets(moduletable['main'],
+ moduletable, 0, True, False, True, replace_auxdir)
if witness_c_macro:
emit += ' m4_popdef([gl_MODULE_INDICATOR_CONDITION])\n'
emit += ' # End of code from modules\n'
- emit += self.emiter.initmacro_end(macro_prefix)
+ emit += self.emitter.initmacro_end(macro_prefix)
emit += ' gltests_libdeps=\n'
emit += ' gltests_ltlibdeps=\n'
- emit += self.emiter.initmacro_start('%stests' % macro_prefix)
+ emit += self.emitter.initmacro_start('%stests' % macro_prefix)
emit += ' gl_source_base=\'%s\'\n' % testsbase
# Define a tests witness macro that depends on the package.
# PACKAGE is defined by AM_INIT_AUTOMAKE, PACKAGE_TARNAME is defined by
emit += ' m4_pushdef([gl_MODULE_INDICATOR_CONDITION], '
emit += '[$gl_module_indicator_condition])\n'
# Emit tests autoconf snippets.
- emit += self.emiter.autoconfSnippets(moduletable['tests'],
- moduletable, 0, True, True, True, replace_auxdir)
+ emit += self.emitter.autoconfSnippets(moduletable['tests'],
+ moduletable, 0, True, True, True, replace_auxdir)
emit += ' m4_popdef([gl_MODULE_INDICATOR_CONDITION])\n'
- emit += self.emiter.initmacro_end('%stests' % macro_prefix)
+ emit += self.emitter.initmacro_end('%stests' % macro_prefix)
# _LIBDEPS and _LTLIBDEPS variables are not needed if this library is
# created using libtool, because libtool already handles the dependencies.
if not libtool:
emit += ' LIBTESTS_LIBDEPS="$gltests_libdeps"\n'
emit += ' AC_SUBST([LIBTESTS_LIBDEPS])\n'
emit += '])\n'
- emit += self.emiter.initmacro_done(macro_prefix, sourcebase)
- emit += self.emiter.initmacro_done('%stests' % macro_prefix, testsbase)
+ emit += self.emitter.initmacro_done(macro_prefix, sourcebase)
+ emit += self.emitter.initmacro_done('%stests' % macro_prefix, testsbase)
emit += '''
# This macro records the list of files which have been installed by
# gnulib-tool and may be removed by future gnulib-tool invocations.
# Create library makefile.
basename = joinpath(sourcebase, makefile_am)
tmpfile = self.assistant.tmpfilename(basename)
- emit, uses_subdirs = self.emiter.lib_Makefile_am(basename,
- self.moduletable['main'], self.moduletable, self.makefiletable,
- actioncmd, for_test)
+ emit, uses_subdirs = self.emitter.lib_Makefile_am(basename,
+ self.moduletable['main'], self.moduletable, self.makefiletable,
+ actioncmd, for_test)
with codecs.open(tmpfile, 'wb', 'UTF-8') as file:
file.write(emit)
filename, backup, flag = self.assistant.super_update(basename, tmpfile)
# Create po makefile parameterization, part 1.
basename = joinpath(pobase, 'Makevars')
tmpfile = self.assistant.tmpfilename(basename)
- emit = self.emiter.po_Makevars()
+ emit = self.emitter.po_Makevars()
with codecs.open(tmpfile, 'wb', 'UTF-8') as file:
file.write(emit)
filename, backup, flag = self.assistant.super_update(basename, tmpfile)
basename = joinpath(pobase, 'POTFILES.in')
tmpfile = self.assistant.tmpfilename(basename)
with codecs.open(tmpfile, 'wb', 'UTF-8') as file:
- file.write(self.emiter.po_POTFILES_in(filetable['all']))
+ file.write(self.emitter.po_POTFILES_in(filetable['all']))
basename = joinpath(pobase, 'POTFILES.in')
filename, backup, flag = self.assistant.super_update(basename, tmpfile)
if flag == 1:
if inctests:
basename = joinpath(testsbase, makefile_am)
tmpfile = self.assistant.tmpfilename(basename)
- emit, uses_subdirs = self.emiter.lib_Makefile_am(basename,
- self.moduletable['tests'], self.moduletable, self.makefiletable,
- actioncmd, for_test)
+ emit, uses_subdirs = self.emitter.lib_Makefile_am(basename,
+ self.moduletable['tests'], self.moduletable, self.makefiletable,
+ actioncmd, for_test)
with codecs.open(tmpfile, 'wb', 'UTF-8') as file:
file.write(emit)
filename, backup, flag = self.assistant.super_update(basename, tmpfile)
# Define GLInfo class
#===============================================================================
class GLInfo(object):
- '''This class is used to get fromatted information about gnulib-tool.
+ '''This class is used to get formatted information about gnulib-tool.
This information is mainly used in stdout messages, but can be used
anywhere else. The return values are not the same as for the module,
but still depends on them.'''
os.mkdir(self.testdir)
except Exception as error:
raise GLError(19, self.testdir)
- self.emiter = GLEmiter(self.config)
+ self.emitter = GLEmiter(self.config)
self.filesystem = GLFileSystem(self.config)
self.modulesystem = GLModuleSystem(self.config)
self.assistant = GLFileAssistant(self.config)
os.mkdir(directory)
destfile = joinpath(directory, 'Makefile.am')
if single_configure:
- emit, uses_subdirs = self.emiter.lib_Makefile_am(destfile, main_modules,
- moduletable, self.makefiletable, '', for_test)
+ emit, uses_subdirs = self.emitter.lib_Makefile_am(destfile, main_modules,
+ moduletable, self.makefiletable, '', for_test)
else: # if not single_configure
- emit, uses_subdirs = self.emiter.lib_Makefile_am(destfile, modules,
- moduletable, self.makefiletable, '', for_test)
+ emit, uses_subdirs = self.emitter.lib_Makefile_am(destfile, modules,
+ moduletable, self.makefiletable, '', for_test)
with codecs.open(destfile, 'wb', 'UTF-8') as file:
file.write(emit)
any_uses_subdirs = uses_subdirs
subdirs = [sourcebase, m4base]
subdirs_with_configure_ac = list()
- testsbase_appened = False
+ testsbase_append = False
inctests = self.config.checkInclTestCategory(TESTS['tests'])
if inctests:
directory = joinpath(self.testdir, testsbase)
# Create $testsbase/Makefile.am.
destfile = joinpath(directory, 'Makefile.am')
witness_macro = '%stests_WITNESS' % macro_prefix
- emit, uses_subdirs = self.emiter.tests_Makefile_am(destfile,
- tests_modules, self.makefiletable, witness_macro, for_test)
+ emit, uses_subdirs = self.emitter.tests_Makefile_am(destfile,
+ tests_modules, self.makefiletable, witness_macro, for_test)
with codecs.open(destfile, 'wb', 'UTF-8') as file:
file.write(emit)
else: # if not single_configure
destfile = joinpath(directory, 'Makefile.am')
libtests = False
self.config.setLibtests(False)
- emit, uses_subdirs = self.emiter.tests_Makefile_am(destfile,
- modules, self.makefiletable, '', for_test)
+ emit, uses_subdirs = self.emitter.tests_Makefile_am(destfile,
+ modules, self.makefiletable, '', for_test)
with codecs.open(destfile, 'wb', 'UTF-8') as file:
file.write(emit)
# Viewed from the $testsbase subdirectory, $auxdir is different.
emit += 'AC_PROG_CC\n'
emit += 'AC_PROG_INSTALL\n'
emit += 'AC_PROG_MAKE_SET\n'
- emit += self.emiter.preEarlyMacros(False, '', modules)
+ emit += self.emitter.preEarlyMacros(False, '', modules)
if uses_subdirs:
emit += 'AM_PROG_CC_C_O\n\n'
snippets = list()
emit += 'AC_DEFUN([gl_INIT], [\n'
replace_auxdir = True
emit += "gl_m4_base='../%s'\n" % m4base
- emit += self.emiter.initmacro_start(macro_prefix)
+ emit += self.emitter.initmacro_start(macro_prefix)
# We don't have explicit ordering constraints between the various
# autoconf snippets. It's cleanest to put those of the library before
# those of the tests.
emit += "gl_source_base='../%s'\n" % sourcebase
- emit += self.emiter.autoconfSnippets(modules,
- moduletable, 1, False, False, False,
- replace_auxdir)
+ emit += self.emitter.autoconfSnippets(modules,
+ moduletable, 1, False, False, False,
+ replace_auxdir)
emit += "gl_source_base='.'"
- emit += self.emiter.autoconfSnippets(modules,
- moduletable, 2, False, False, False,
- replace_auxdir)
- emit += self.emiter.initmacro_end(macro_prefix)
+ emit += self.emitter.autoconfSnippets(modules,
+ moduletable, 2, False, False, False,
+ replace_auxdir)
+ emit += self.emitter.initmacro_end(macro_prefix)
# _LIBDEPS and _LTLIBDEPS variables are not needed if this library is
# created using libtool, because libtool already handles the
# dependencies.
emit += ' AC_SUBST([%s_LTLIBDEPS])\n' % libname_upper
emit += '])\n'
# FIXME use $sourcebase or $testsbase?
- emit += self.emiter.initmacro_done(macro_prefix, sourcebase)
+ emit += self.emitter.initmacro_done(macro_prefix, sourcebase)
emit += '\ngl_INIT\n\n'
# Usually $testsbase/config.h will be a superset of config.h. Verify
# this by "merging" config.h into $testsbase/config.h; look out for gcc
subdirs_with_configure_ac += [testsbase]
subdirs += [testsbase]
- testsbase_appened = True
+ testsbase_append = True
# Create Makefile.am.
emit = '## Process this file with automake to produce Makefile.in.\n\n'
emit += 'm4_pattern_allow([^gl_ES$])dnl a valid locale name\n'
emit += 'm4_pattern_allow([^gl_LIBOBJS$])dnl a variable\n'
emit += 'm4_pattern_allow([^gl_LTLIBOBJS$])dnl a variable\n'
- emit += self.emiter.preEarlyMacros(False, '', modules)
+ emit += self.emitter.preEarlyMacros(False, '', modules)
if any_uses_subdirs:
emit += 'AM_PROG_CC_C_O\n'
snippets = list()
else: # auxdir == 'build-aux'
replace_auxdir = False
emit += 'gl_m4_base=\'%s\'\n' % m4base
- emit += self.emiter.initmacro_start(macro_prefix)
+ emit += self.emitter.initmacro_start(macro_prefix)
emit += 'gl_source_base=\'%s\'\n' % sourcebase
if single_configure:
- emit += self.emiter.autoconfSnippets(main_modules, moduletable,
- 0, False, False, False, replace_auxdir)
+ emit += self.emitter.autoconfSnippets(main_modules, moduletable,
+ 0, False, False, False, replace_auxdir)
else: # if not single_configure
- emit += self.emiter.autoconfSnippets(modules, moduletable,
- 1, False, False, False, replace_auxdir)
- emit += self.emiter.initmacro_end(macro_prefix)
+ emit += self.emitter.autoconfSnippets(modules, moduletable,
+ 1, False, False, False, replace_auxdir)
+ emit += self.emitter.initmacro_end(macro_prefix)
if single_configure:
emit += ' gltests_libdeps=\n'
emit += ' gltests_ltlibdeps=\n'
- emit += self.emiter.initmacro_start('%stests' % macro_prefix)
+ emit += self.emitter.initmacro_start('%stests' % macro_prefix)
emit += ' gl_source_base=\'%s\'\n' % testsbase
# Define a tests witness macro.
emit += ' %stests_WITNESS=IN_GNULIB_TESTS\n' % macro_prefix
emit += ' gl_module_indicator_condition=$%stests_WITNESS\n' % macro_prefix
emit += ' m4_pushdef([gl_MODULE_INDICATOR_CONDITION], '
emit += '[$gl_module_indicator_condition])\n'
- snippets = self.emiter.autoconfSnippets(tests_modules, moduletable,
- 1, True, False, False, replace_auxdir)
+ snippets = self.emitter.autoconfSnippets(tests_modules, moduletable,
+ 1, True, False, False, replace_auxdir)
emit += snippets.strip()
emit += ' m4_popdef([gl_MODULE_INDICATOR_CONDITION])\n'
- emit += self.emiter.initmacro_end('%stests' % macro_prefix)
+ emit += self.emitter.initmacro_end('%stests' % macro_prefix)
# _LIBDEPS and _LTLIBDEPS variables are not needed if this library is
# created using libtool, because libtool already handles the dependencies.
if not libtool:
emit += ' LIBTESTS_LIBDEPS="$gltests_libdeps"\n'
emit += ' AC_SUBST([LIBTESTS_LIBDEPS])\n'
emit += '])\n'
- emit += self.emiter.initmacro_done(macro_prefix, sourcebase)
+ emit += self.emitter.initmacro_done(macro_prefix, sourcebase)
if single_configure:
- emit += self.emiter.initmacro_done('%stests' % macro_prefix, testsbase)
+ emit += self.emitter.initmacro_done('%stests' % macro_prefix, testsbase)
emit += '\ngl_INIT\n\n'
if subdirs_with_configure_ac:
if single_configure:
os.mkdir(self.megatestdir)
except Exception as error:
raise GLError(19, self.megatestdir)
- self.emiter = GLEmiter(self.config)
+ self.emitter = GLEmiter(self.config)
self.filesystem = GLFileSystem(self.config)
self.modulesystem = GLModuleSystem(self.config)
self.assistant = GLFileAssistant(self.config)
the common infrastructure needed by GNU packages.'''
__copyright__ = '2012-2022 Free Software Foundation, Inc.'
-__author__ = 'Dmitriy Selyutin'
+__author__ = 'Dmitry Selyutin'
__license__ = 'GNU GPLv3+'
'Bruno Haible',
'Paul Eggert',
'Simon Josefsson',
- 'Dmitriy Selyutin',
+ 'Dmitry Selyutin',
]
__license__ = 'GNU GPLv3+'
__copyright__ = '2002-2022 Free Software Foundation, Inc.'
break;
case 1:
{
- /* Check an invocation of a non-existent program. */
- const char *prog_argv[3] = { "./non-existent", NULL };
+ /* Check an invocation of a nonexistent program. */
+ const char *prog_argv[3] = { "./nonexistent", NULL };
int ret = execute (progname, prog_argv[0], prog_argv, NULL,
false, false, false, false, true, false, NULL);
ASSERT (ret == 127);
#if defined __linux__
/* On Linux, it is possible to set up a chroot environment in such a way
- that stdin is connected to a tty and nervertheless /proc/self/loginuid
+ that stdin is connected to a tty and nevertheless /proc/self/loginuid
contains the value (uid_t)(-1). In this situation, getlogin() and
getlogin_r() fail; this is expected. */
bool loginuid_undefined = false;
INT_<op>_OVERFLOW tests, so define macros to do both. OP is the
operation, OPNAME its symbolic name, A and B its operands, T the
result type, V the overflow flag, and VRES the result if V and if
- two's complement. CHECK_BINOP is for most binary operatinos,
+ two's complement. CHECK_BINOP is for most binary operations,
CHECK_SBINOP for binary +, -, * when the result type is signed,
and CHECK_UNOP for unary operations. */
#define CHECK_BINOP(op, opname, a, b, t, v, vres) \
#undef THREAD_COUNT
-/* --- Test thread-local storage with with races between init and destroy --- */
+/* --- Test thread-local storage with races between init and destroy --- */
/* Number of simultaneous threads. */
#if defined __ANDROID__
prot_unwritable = PROT_READ;
# endif
- /* Setup some mmaped memory. */
+ /* Setup some mmapped memory. */
p = mmap_zeromap ((void *) 0x12340000, 0x4000);
if (p == (void *)(-1))
{
prot_unwritable = PROT_READ;
# endif
- /* Setup some mmaped memory. */
+ /* Setup some mmapped memory. */
p = mmap_zeromap ((void *) 0x12340000, 0x4000);
if (p == (void *)(-1))
{
prot_unwritable = PROT_READ;
# endif
- /* Setup some mmaped memory. */
+ /* Setup some mmapped memory. */
p = mmap_zeromap ((void *) 0x12340000, 0x4000);
if (p == (void *)(-1))
{
#undef THREAD_COUNT
-/* --- Test thread-local storage with with races between init and destroy --- */
+/* --- Test thread-local storage with races between init and destroy --- */
/* Number of simultaneous threads. */
#define THREAD_COUNT 10
#undef THREAD_COUNT
-/* --- Test thread-local storage with with races between init and destroy --- */
+/* --- Test thread-local storage with races between init and destroy --- */
/* Number of simultaneous threads. */
#define THREAD_COUNT 10
# Handle the still-experimental Automake-NG programs specially.
# They remain named as the mainstream Automake programs ("automake",
# and "aclocal") to avoid gratuitous incompatibilities with
- # pre-existing usages (by, say, autoreconf, or custom autogen.sh
+ # preexisting usages (by, say, autoreconf, or custom autogen.sh
# scripts), but correctly identify themselves (as being part of
# "GNU automake-ng") when asked their version.
case $app in
# subdirectory, let's call it a "subcheckout") are:
# - The simplicity: you are conceptually always using the newest revision
# of the dependency package.
-# - You don't have to remember to periodially upgrade the dependency.
+# - You don't have to remember to periodically upgrade the dependency.
# Upgrading the dependency is an implicit operation.
# This program is meant to be copied to the top-level directory of the package,
@prohibit='grep -q' halt="unportable 'grep -q', use >/dev/null instead" \
$(_sc_search_regexp)
-# The GNU Codying standards says that README should refer to both
+# The GNU Coding standards say that README should refer to both
# INSTALL and the file that contains the copying conditions. This
# shall be COPYING for GPL and COPYING.LESSER for LGPL.