summaryrefslogtreecommitdiff
path: root/x2p/util.c
diff options
context:
space:
mode:
authorLarry Wall <larry@wall.org>1988-06-05 00:00:00 +0000
committerLarry Wall <larry@wall.org>1988-06-05 00:00:00 +0000
commit378cc40b38293ffc7298c6a7ed3cd740ad79be52 (patch)
tree87bedf9adc5c88847a2e2d85963df5f94435aaf5 /x2p/util.c
parenta4de7c03d0bdc29d9d3a18abad4ac2628182ed7b (diff)
downloadperl-378cc40b38293ffc7298c6a7ed3cd740ad79be52.tar.gz
perl 2.0 (no announcement message available)perl-2.0
Some of the enhancements from Perl1 included: * New regexp routines derived from Henry Spencer's. o Support for /(foo|bar)/. o Support for /(foo)*/ and /(foo)+/. o \s for whitespace, \S for non-, \d for digit, \D nondigit * Local variables in blocks, subroutines and evals. * Recursive subroutine calls are now supported. * Array values may now be interpolated into lists: unlink 'foo', 'bar', @trashcan, 'tmp'; * File globbing. * Use of <> in array contexts returns the whole file or glob list. * New iterator for normal arrays, foreach, that allows both read and write. * Ability to open pipe to a forked off script for secure pipes in setuid scripts. * File inclusion via do 'foo.pl'; * More file tests, including -t to see if, for instance, stdin is a terminal. File tests now behave in a more correct manner. You can do file tests on filehandles as well as filenames. The special filetests -T and -B test a file to see if it's text or binary. * An eof can now be used on each file of the <> input for such purposes as resetting the line numbers or appending to each file of an inplace edit. * Assignments can now function as lvalues, so you can say things like ($HOST = $host) =~ tr/a-z/A-Z/; ($obj = $src) =~ s/\.c$/.o/; * You can now do certain file operations with a variable which holds the name of a filehandle, e.g. open(++$incl,$includefilename); $foo = <$incl>; * Warnings are now available (with -w) on use of uninitialized variables and on identifiers that are mentioned only once, and on reference to various undefined things. * There is now a wait operator. * There is now a sort operator. * The manual is now not lying when it says that perl is generally faster than sed. I hope.
Diffstat (limited to 'x2p/util.c')
-rw-r--r--x2p/util.c17
1 files changed, 11 insertions, 6 deletions
diff --git a/x2p/util.c b/x2p/util.c
index 83adfc276b..0d98de807c 100644
--- a/x2p/util.c
+++ b/x2p/util.c
@@ -1,8 +1,8 @@
-/* $Header: util.c,v 1.0 87/12/18 13:07:34 root Exp $
+/* $Header: util.c,v 2.0 88/06/05 00:16:07 root Exp $
*
* $Log: util.c,v $
- * Revision 1.0 87/12/18 13:07:34 root
- * Initial revision
+ * Revision 2.0 88/06/05 00:16:07 root
+ * Baseline version 2.0.
*
*/
@@ -136,8 +136,12 @@ register char *to, *from;
register int delim;
{
for (; *from; from++,to++) {
- if (*from == '\\' && from[1] == delim)
- *to++ = *from++;
+ if (*from == '\\') {
+ if (from[1] == delim)
+ from++;
+ else if (from[1] == '\\')
+ *to++ = *from++;
+ }
else if (*from == delim)
break;
*to = *from;
@@ -146,13 +150,14 @@ register int delim;
return from;
}
+
char *
cpy2(to,from,delim)
register char *to, *from;
register int delim;
{
for (; *from; from++,to++) {
- if (*from == '\\' && from[1] == delim)
+ if (*from == '\\')
*to++ = *from++;
else if (*from == '$')
*to++ = '\\';