OpenBSD CVS

CVS log for src/usr.bin/make/str.c


[BACK] Up to [local] / src / usr.bin / make

Request diff between arbitrary revisions


Default branch: MAIN


Revision 1.33 / (download) - annotate - [select for diffs], Mon Sep 4 11:35:11 2023 UTC (8 months, 2 weeks ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_7_5_BASE, OPENBSD_7_5, OPENBSD_7_4_BASE, OPENBSD_7_4, HEAD
Changes since 1.32: +1 -2 lines
Diff to previous 1.32 (colored)

GC old code that was originally implemented to facilitate adoption by
other BSDs, which never happened, so make things simpler for further
development.

Ditches config.h entirely since it gets reduced to 2 defines.

okay tb@

Revision 1.32 / (download) - annotate - [select for diffs], Tue May 21 17:21:02 2019 UTC (4 years, 11 months ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_7_3_BASE, OPENBSD_7_3, OPENBSD_7_2_BASE, OPENBSD_7_2, OPENBSD_7_1_BASE, OPENBSD_7_1, OPENBSD_7_0_BASE, OPENBSD_7_0, OPENBSD_6_9_BASE, OPENBSD_6_9, OPENBSD_6_8_BASE, OPENBSD_6_8, OPENBSD_6_7_BASE, OPENBSD_6_7, OPENBSD_6_6_BASE, OPENBSD_6_6
Changes since 1.31: +6 -4 lines
Diff to previous 1.31 (colored)

document brk_string slightly better
remove the comment about .MAKE, since that's only true when called from
main, and explain about the other parameters

Revision 1.31 / (download) - annotate - [select for diffs], Sun May 18 08:08:50 2014 UTC (10 years ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_6_5_BASE, OPENBSD_6_5, OPENBSD_6_4_BASE, OPENBSD_6_4, OPENBSD_6_3_BASE, OPENBSD_6_3, OPENBSD_6_2_BASE, OPENBSD_6_2, OPENBSD_6_1_BASE, OPENBSD_6_1, OPENBSD_6_0_BASE, OPENBSD_6_0, OPENBSD_5_9_BASE, OPENBSD_5_9, OPENBSD_5_8_BASE, OPENBSD_5_8, OPENBSD_5_7_BASE, OPENBSD_5_7, OPENBSD_5_6_BASE, OPENBSD_5_6
Changes since 1.30: +2 -2 lines
Diff to previous 1.30 (colored)

a bit more reallocarray (and kill ecalloc, which isn't used)
okay chl@

Revision 1.30 / (download) - annotate - [select for diffs], Mon May 12 19:11:19 2014 UTC (10 years ago) by espie
Branch: MAIN
Changes since 1.29: +2 -2 lines
Diff to previous 1.29 (colored)

adjust to ohash being in libutil now, and to the interface changes.
fix potential integer overflows in memory allocation (mostly for pedagogical
purposes, these are unlikely to overflow in practice)
move the rest of lst.lib stuff into its own directory.

Revision 1.29 / (download) - annotate - [select for diffs], Tue Apr 22 08:26:31 2014 UTC (10 years ago) by espie
Branch: MAIN
Changes since 1.28: +3 -3 lines
Diff to previous 1.28 (colored)

effectively use emult_realloc, okay guenther@

Revision 1.28 / (download) - annotate - [select for diffs], Fri Nov 22 15:47:35 2013 UTC (10 years, 5 months ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_5_5_BASE, OPENBSD_5_5
Changes since 1.27: +2 -2 lines
Diff to previous 1.27 (colored)

wrappers for is*/to* that make damn sure their arguments are
cast to unsigned chars.

okay deraadt@

Revision 1.27 / (download) - annotate - [select for diffs], Mon Jul 19 19:46:44 2010 UTC (13 years, 10 months ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_5_4_BASE, OPENBSD_5_4, OPENBSD_5_3_BASE, OPENBSD_5_3, OPENBSD_5_2_BASE, OPENBSD_5_2, OPENBSD_5_1_BASE, OPENBSD_5_1, OPENBSD_5_0_BASE, OPENBSD_5_0, OPENBSD_4_9_BASE, OPENBSD_4_9, OPENBSD_4_8_BASE, OPENBSD_4_8
Changes since 1.26: +1 -2 lines
Diff to previous 1.26 (colored)

Correct $OpenBSD$ stuff

Revision 1.26 / (download) - annotate - [select for diffs], Mon Jul 19 19:30:37 2010 UTC (13 years, 10 months ago) by espie
Branch: MAIN
Changes since 1.25: +1 -1 lines
Diff to previous 1.25 (colored)

two small changes:
- allow variables in SysV modifiers, as requested by matthieu@
(since recursive variables are an extension, this just extends the
extension)
- variation on :Q  called :QL (quote list), which does quote every character
EXCEPT for whitespace. e.g.,

toto:
	@for i in ${VAR:QL} ...

Revision 1.25 / (download) - annotate - [select for diffs], Mon Sep 17 09:44:20 2007 UTC (16 years, 8 months ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_4_7_BASE, OPENBSD_4_7, OPENBSD_4_6_BASE, OPENBSD_4_6, OPENBSD_4_5_BASE, OPENBSD_4_5, OPENBSD_4_4_BASE, OPENBSD_4_4, OPENBSD_4_3_BASE, OPENBSD_4_3
Changes since 1.24: +2 -2 lines
Diff to previous 1.24 (colored)

zap more spaces at end of line

Revision 1.24 / (download) - annotate - [select for diffs], Mon Sep 17 09:28:36 2007 UTC (16 years, 8 months ago) by espie
Branch: MAIN
Changes since 1.23: +17 -17 lines
Diff to previous 1.23 (colored)

kill extra spaces at end of line

Revision 1.23 / (download) - annotate - [select for diffs], Sun Sep 16 15:24:53 2007 UTC (16 years, 8 months ago) by espie
Branch: MAIN
Changes since 1.22: +255 -255 lines
Diff to previous 1.22 (colored)

finish reindenting str.c

Revision 1.22 / (download) - annotate - [select for diffs], Sun Sep 16 15:17:44 2007 UTC (16 years, 8 months ago) by espie
Branch: MAIN
Changes since 1.21: +75 -73 lines
Diff to previous 1.21 (colored)

remove some of the complexity of Str_Matchi by separating code into
range_match and star_match to handle special characters.

reindent.

Revision 1.21 / (download) - annotate - [select for diffs], Wed Apr 7 13:11:36 2004 UTC (20 years, 1 month ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_4_2_BASE, OPENBSD_4_2, OPENBSD_4_1_BASE, OPENBSD_4_1, OPENBSD_4_0_BASE, OPENBSD_4_0, OPENBSD_3_9_BASE, OPENBSD_3_9, OPENBSD_3_8_BASE, OPENBSD_3_8, OPENBSD_3_7_BASE, OPENBSD_3_7, OPENBSD_3_6_BASE, OPENBSD_3_6
Changes since 1.20: +33 -55 lines
Diff to previous 1.20 (colored)

ISO function declarations, trim a few comments, rename a few variables to
more explicit/more consistent names.

okay otto@

Revision 1.20 / (download) - annotate - [select for diffs], Tue Jun 3 02:56:12 2003 UTC (20 years, 11 months ago) by millert
Branch: MAIN
CVS Tags: OPENBSD_3_5_BASE, OPENBSD_3_5, OPENBSD_3_4_BASE, OPENBSD_3_4
Changes since 1.19: +2 -6 lines
Diff to previous 1.19 (colored)

Remove the advertising clause in the UCB license which Berkeley
rescinded 22 July 1999.  Proofed by myself and Theo.

Revision 1.19 / (download) - annotate - [select for diffs], Wed May 23 12:34:49 2001 UTC (23 years ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_3_3_BASE, OPENBSD_3_3, OPENBSD_3_2_BASE, OPENBSD_3_2, OPENBSD_3_1_BASE, OPENBSD_3_1, OPENBSD_3_0_BASE, OPENBSD_3_0
Changes since 1.18: +44 -71 lines
Diff to previous 1.18 (colored)

Mostly clean-up:
- cut up those huge include files into separate interfaces for all modules.
Put the interface documentation there, and not with the implementation.
- light-weight includes for needed concrete types (lst_t.h, timestamp_t.h).
- cut out some more logically separate parts: cmd_exec, varname, parsevar,
timestamp.
- put all error handling functions together, so that we will be able to
clean them up.
- more systematic naming: functioni  to handle interval, function to handle
string.
- put the init/end code apart to minimize coupling.
- kill weird types like ReturnStatus and Boolean. Use standard bool (with a
fallback for non-iso systems)
- better interface documentation for lots of subsystems.

As a result, make compilation goes somewhat faster (5%, even considering
the largish BSD copyrights to read). The corresponding preprocessed
source goes down from 1,5M to 1M.

A few minor code changes as well: Parse_DoVar is no longer destructive.
Parse_IsVar functionality is folded into Parse_DoVar (as it knows what an
assignment is), a few more interval handling functions. Avoid calling
XXX_End when they do nothing, just #define XXX_End   to nothing.

Parse_DoVar is slightly more general: it will handle compound assignments
as long as they make sense, e.g., VAR +!= cmd
will work.  As a side effect, VAR++=value now triggers an error
(two + in assignment).
- this stuff doesn't occur in portable Makefiles.
- writing VAR++ = value or VAR+ +=value  disambiguates it.
- this is a good thing, it uncovered a bug in bsd.port.mk.

Tested by naddy@. Okayed millert@. I'll handle the fallback if there is
any. This went through a full make build anyways, including isakmpd
(without mickey's custom binutils, as he didn't see fit to share it with me).

Revision 1.18 / (download) - annotate - [select for diffs], Mon May 7 22:54:53 2001 UTC (23 years ago) by espie
Branch: MAIN
Changes since 1.17: +4 -3 lines
Diff to previous 1.17 (colored)

Even though str_concati is supposed to handle intervals, it was still
assuming '\0' at the end.

-> importance of proper make bug reports, this was first diagnosed as
a for loop issue...

Revision 1.17 / (download) - annotate - [select for diffs], Thu May 3 13:41:11 2001 UTC (23 years ago) by espie
Branch: MAIN
Changes since 1.16: +182 -178 lines
Diff to previous 1.16 (colored)

Synch with my current work.
Numerous changes:
- generate can build several tables
- style cleanup
- statistics code
- use variable names throughout (struct Name)
- recursive variables everywhere
- faster parser (pass buffer along instead of allocating multiple copies)
- correct parser. Handles comments everywhere, and ; correctly
- more string intervals
- simplified dir.c, less recursion.
- extended for loops
- sinclude()
- finished removing extra junk from Lst_*
- handles ${@D} and friends in a simpler way
- cleaned up and modular VarModifiers handling.
- recognizes some gnu Makefile usages and errors out about them.

Additionally, some extra functionality is defined by FEATURES. The set of
functionalities is currently hardcoded to OpenBSD defaults, but this may
include support for some NetBSD extensions, like ODE modifiers.

Backed by miod@ and millert@, who finally got sick of my endless patches...

Revision 1.16 / (download) - annotate - [select for diffs], Thu Sep 14 13:35:38 2000 UTC (23 years, 8 months ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_2_9_BASE, OPENBSD_2_9, OPENBSD_2_8_BASE, OPENBSD_2_8
Changes since 1.15: +77 -2 lines
Diff to previous 1.15 (colored)

Two new functions:

iterate_words: light-weight equivalent to brk_string,
which does not need to copy the string, and does not do \ interpretation
which are only needed for the string.

escape_dup: handles escape sequence in a systematic way.

This speeds up variable modifiers.

This also makes .for loops more consistent, as they use the same definition
of `a word' as the rest of make.

Revision 1.15 / (download) - annotate - [select for diffs], Thu Sep 14 13:32:07 2000 UTC (23 years, 8 months ago) by espie
Branch: MAIN
Changes since 1.14: +5 -4 lines
Diff to previous 1.14 (colored)

Some systematic clean-up.
- UNUSED macro that expands to __attribute__((unused)) for gcc
- move rcsid around so that they can be tagged UNUSED.
- activate -Wunused.
- use UNUSED instead of kludgy junk for function arguments.
- add extern to all extern prototypes.
- update comments in lst.h.
- clean up var.c a little bit, constifying arguments, updating comments...

Revision 1.14 / (download) - annotate - [select for diffs], Mon Jul 17 23:01:20 2000 UTC (23 years, 10 months ago) by espie
Branch: MAIN
Changes since 1.13: +118 -88 lines
Diff to previous 1.13 (colored)

This does replace Str_Match with a better routine, which handles negated
intervals, and \\ in intervals.

Accordingly, var.c no longer needs to copy the :Marg to replace \: with :

We don't use fnmatch(3) because of various optimizations which are harder
to achieve in a generic setting.

Also add regression suite for the Str_Match function.

Revision 1.13 / (download) - annotate - [select for diffs], Mon Jul 17 22:57:37 2000 UTC (23 years, 10 months ago) by espie
Branch: MAIN
Changes since 1.12: +22 -27 lines
Diff to previous 1.12 (colored)

Constify a few functions, propagated from VarModify.
Replace a few int -> size_t

Reviewed by miod@

Revision 1.12 / (download) - annotate - [select for diffs], Fri Jun 23 16:41:53 2000 UTC (23 years, 11 months ago) by espie
Branch: MAIN
Changes since 1.11: +27 -37 lines
Diff to previous 1.11 (colored)

This patch replaces str_concat with a slightly unobfuscated version.

In particular, Dir_MakeFlags is abusing str_concat, and works much better
with buffers.

Revision 1.11 / (download) - annotate - [select for diffs], Thu Dec 9 18:18:24 1999 UTC (24 years, 5 months ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_2_7_BASE, OPENBSD_2_7
Changes since 1.10: +4 -4 lines
Diff to previous 1.10 (colored)

Introduce `common usage' buf patterns and use them.

Revision 1.10 / (download) - annotate - [select for diffs], Mon Dec 6 22:24:32 1999 UTC (24 years, 5 months ago) by espie
Branch: MAIN
Changes since 1.9: +5 -5 lines
Diff to previous 1.9 (colored)

Clean up buffers interface somewhat:

- buf.c deals exclusively with chars. Be explicit about it, and remove
extraneous dumb casts to char (can hide real type errors).
- buffer sizes are size_t. Note that bp->left can never become NULL.
- Buf_GetAll is happy with a NULL pointer for the size, remove unneeded
extra pointers.
- Propagate size_t to all places where buffer functions are used.

Revision 1.9 / (download) - annotate - [select for diffs], Mon Dec 6 22:18:56 1999 UTC (24 years, 5 months ago) by espie
Branch: MAIN
Changes since 1.8: +15 -2 lines
Diff to previous 1.8 (colored)

- introduce interval_dup in str.c
- use it to replace .for parsing with something approaching sanity.
(this removes one of the few most blatant misuses of Bufs in make.

More changes to come... patch reviewed by ho@

Revision 1.8 / (download) - annotate - [select for diffs], Thu Nov 11 11:35:17 1999 UTC (24 years, 6 months ago) by espie
Branch: MAIN
Changes since 1.7: +2 -40 lines
Diff to previous 1.7 (colored)

Kill Str_FindSubString, it's strstr.

Revision 1.7 / (download) - annotate - [select for diffs], Sat Dec 5 00:06:29 1998 UTC (25 years, 5 months ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_2_6_BASE, OPENBSD_2_6, OPENBSD_2_5_BASE, OPENBSD_2_5
Changes since 1.6: +8 -42 lines
Diff to previous 1.6 (colored)

Modifications from netbsd:
- don't interfere with MACHINE/MACHINE_ARCH defines for bootstrap
- type clean-up, time_t, and printing `unknown' ints
- fix TARGET/MEMBER bug in archive rules
- memmove...
- cleaner Error handler.
- reentrant brk_string
- .MAKE env variable
- preliminary scaffolding for .NOPATH

Other improvements:
- efree
- shellneed streamlined
- display Stop in .CURDIR after an error.
- document most features and misfeatures.
- add a few OpenBSD notes to the tutorial.

Revision 1.6 / (download) - annotate - [select for diffs], Sat Mar 7 18:34:50 1998 UTC (26 years, 2 months ago) by millert
Branch: MAIN
CVS Tags: OPENBSD_2_4_BASE, OPENBSD_2_4, OPENBSD_2_3_BASE, OPENBSD_2_3
Changes since 1.5: +4 -4 lines
Diff to previous 1.5 (colored)

make gcc 2.8 happy

Revision 1.5 / (download) - annotate - [select for diffs], Sat Nov 30 21:09:04 1996 UTC (27 years, 5 months ago) by millert
Branch: MAIN
CVS Tags: OPENBSD_2_2_BASE, OPENBSD_2_2, OPENBSD_2_1_BASE, OPENBSD_2_1
Changes since 1.4: +18 -17 lines
Diff to previous 1.4 (colored)

Sync with NetBSD:
- Merge in FreeBSD and Lite2 changes.
- Fix bug where a non-archive target with a .a suffix would always
  be considered to be out of date, since it does not have a TOC.
- Fix NetBSD PR #2930: declare missing variable.

Revision 1.4 / (download) - annotate - [select for diffs], Wed Jun 26 05:36:37 1996 UTC (27 years, 10 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_2_0_BASE, OPENBSD_2_0
Changes since 1.3: +2 -1 lines
Diff to previous 1.3 (colored)

rcsid

Revision 1.3 / (download) - annotate - [select for diffs], Sun Apr 21 23:43:26 1996 UTC (28 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.2: +4 -5 lines
Diff to previous 1.2 (colored)

sync to netbsd 960418

Revision 1.2 / (download) - annotate - [select for diffs], Wed Nov 1 17:16:32 1995 UTC (28 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.1: +4 -4 lines
Diff to previous 1.1 (colored)

Always ensure space for trailing NULL in argv

Revision 1.1.1.1 / (download) - annotate - [select for diffs] (vendor branch), Wed Oct 18 08:45:43 1995 UTC (28 years, 7 months ago) by deraadt
CVS Tags: netbsd_1_1
Changes since 1.1: +0 -0 lines
Diff to previous 1.1 (colored)

initial import of NetBSD tree

Revision 1.1 / (download) - annotate - [select for diffs], Wed Oct 18 08:45:43 1995 UTC (28 years, 7 months ago) by deraadt
Branch: MAIN

Initial revision

This form allows you to request diff's between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.