X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=util.c;h=ab1d6dc2131b3ec454c1c05d2ca920772d248cc1;hb=5cfbcfcdc45b1cdd758241f7f02495ded7acc722;hp=9720ce73eac1b1b1ddc35f0f6a6376c0b268dd79;hpb=8aa8f774be44d46814d4ddbad03e302f1eb37338;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/util.c b/util.c
index 9720ce7..ab1d6dc 100644
--- a/util.c
+++ b/util.c
@@ -1,6 +1,7 @@
 /*    util.c
  *
- *    Copyright (c) 1991-2002, Larry Wall
+ *    Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+ *    2000, 2001, 2002, 2003, by Larry Wall and others
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
@@ -357,8 +358,12 @@ Perl_fbm_compile(pTHX_ SV *sv, U32 flags)
     I32 rarest = 0;
     U32 frequency = 256;
 
-    if (flags & FBMcf_TAIL)
+    if (flags & FBMcf_TAIL) {
+	MAGIC *mg = SvUTF8(sv) && SvMAGICAL(sv) ? mg_find(sv, PERL_MAGIC_utf8) : NULL;
 	sv_catpvn(sv, "\n", 1);		/* Taken into account in fbm_instr() */
+	if (mg && mg->mg_len >= 0)
+	    mg->mg_len++;
+    }
     s = (U8*)SvPV_force(sv, len);
     (void)SvUPGRADE(sv, SVt_PVBM);
     if (len == 0)		/* TAIL might be on a zero-length string. */
@@ -1242,7 +1247,7 @@ Perl_vwarn(pTHX_ const char* pat, va_list *args)
     }
 
     /* if STDERR is tied, use it instead */
-    if (PL_stderrgv && (io = GvIOp(PL_stderrgv))
+    if (PL_stderrgv && SvREFCNT(PL_stderrgv) && (io = GvIO(PL_stderrgv))
 	&& (mg = SvTIED_mg((SV*)io, PERL_MAGIC_tiedscalar))) {
 	dSP; ENTER;
 	PUSHMARK(SP);
@@ -2192,9 +2197,8 @@ Perl_rsignal(pTHX_ int signo, Sighandler_t handler)
     sigemptyset(&act.sa_mask);
     act.sa_flags = 0;
 #ifdef SA_RESTART
-#if defined(PERL_OLD_SIGNALS)
-    act.sa_flags |= SA_RESTART;	/* SVR4, 4.3+BSD */
-#endif
+    if (PL_signals & PERL_SIGNALS_UNSAFE_FLAG)
+        act.sa_flags |= SA_RESTART;	/* SVR4, 4.3+BSD */
 #endif
 #ifdef SA_NOCLDWAIT
     if (signo == SIGCHLD && handler == (Sighandler_t)SIG_IGN)
@@ -2232,9 +2236,8 @@ Perl_rsignal_save(pTHX_ int signo, Sighandler_t handler, Sigsave_t *save)
     sigemptyset(&act.sa_mask);
     act.sa_flags = 0;
 #ifdef SA_RESTART
-#if defined(PERL_OLD_SIGNALS)
-    act.sa_flags |= SA_RESTART;	/* SVR4, 4.3+BSD */
-#endif
+    if (PL_signals & PERL_SIGNALS_UNSAFE_FLAG)
+        act.sa_flags |= SA_RESTART;	/* SVR4, 4.3+BSD */
 #endif
 #ifdef SA_NOCLDWAIT
     if (signo == SIGCHLD && handler == (Sighandler_t)SIG_IGN)
@@ -3680,7 +3683,7 @@ Perl_scan_vstring(pTHX_ char *s, SV *sv)
 	    }
 #ifdef EBCDIC
 	    if (rev > 0x7FFFFFFF)
-		 Perl_croak(aTHX "In EBCDIC the v-string components cannot exceed 2147483647");
+		 Perl_croak(aTHX_ "In EBCDIC the v-string components cannot exceed 2147483647");
 #endif
 	    /* Append native character for the rev point */
 	    tmpend = uvchr_to_utf8(tmpbuf, rev);
@@ -3780,7 +3783,7 @@ Perl_scan_version(pTHX_ char *s, SV *rv)
  			orev = rev;
  			rev += (*s - '0') * mult;
  			mult /= 10;
- 			if ( abs(orev) > abs(rev) )
+ 			if ( PERL_ABS(orev) > PERL_ABS(rev) )
  			    Perl_croak(aTHX_ "Integer overflow in version");
  			s++;
  		    }
@@ -3790,7 +3793,7 @@ Perl_scan_version(pTHX_ char *s, SV *rv)
  			orev = rev;
  			rev += (*end - '0') * mult;
  			mult *= 10;
- 			if ( abs(orev) > abs(rev) )
+ 			if ( PERL_ABS(orev) > PERL_ABS(rev) )
  			    Perl_croak(aTHX_ "Integer overflow in version");
  		    }
  		} 
@@ -3909,11 +3912,11 @@ Perl_vnumify(pTHX_ SV *vs)
 	return sv;
     }
     digit = SvIVX(*av_fetch((AV *)vs, 0, 0));
-    Perl_sv_setpvf(aTHX_ sv,"%d.",abs(digit));
+    Perl_sv_setpvf(aTHX_ sv,"%d.", PERL_ABS(digit));
     for ( i = 1 ; i <= len ; i++ )
     {
 	digit = SvIVX(*av_fetch((AV *)vs, i, 0));
-	Perl_sv_catpvf(aTHX_ sv,"%03d",abs(digit));
+	Perl_sv_catpvf(aTHX_ sv,"%03d", PERL_ABS(digit));
     }
     if ( len == 0 )
 	 Perl_sv_catpv(aTHX_ sv,"000");
@@ -3991,8 +3994,8 @@ Perl_vcmp(pTHX_ SV *lsv, SV *rsv)
 	I32 right = SvIV(*av_fetch((AV *)rsv,i,0));
 	bool lbeta = left  < 0 ? 1 : 0;
 	bool rbeta = right < 0 ? 1 : 0;
-	left  = abs(left);
-	right = abs(right);
+	left  = PERL_ABS(left);
+	right = PERL_ABS(right);
 	if ( left < right || (left == right && lbeta && !rbeta) )
 	    retval = -1;
 	if ( left > right || (left == right && rbeta && !lbeta) )
@@ -4322,7 +4325,7 @@ Perl_parse_unicode_opts(pTHX_ char **popt)
        if (isDIGIT(*p)) {
 	    opt = (U32) atoi(p);
 	    while (isDIGIT(*p)) p++;
-	    if (*p)
+	    if (*p && *p != '\n' && *p != '\r')
 		 Perl_croak(aTHX_ "Unknown Unicode option letter '%c'", *p);
        }
        else {
@@ -4347,8 +4350,9 @@ Perl_parse_unicode_opts(pTHX_ char **popt)
 		 case PERL_UNICODE_ARGV:
 		      opt |= PERL_UNICODE_ARGV_FLAG;	break;
 		 default:
-		      Perl_croak(aTHX_
-				 "Unknown Unicode option letter '%c'", *p);
+		      if (*p != '\n' && *p != '\r')
+			  Perl_croak(aTHX_
+				     "Unknown Unicode option letter '%c'", *p);
 		 }
 	    }
        }
@@ -4357,7 +4361,7 @@ Perl_parse_unicode_opts(pTHX_ char **popt)
        opt = PERL_UNICODE_DEFAULT_FLAGS;
 
   if (opt & ~PERL_UNICODE_ALL_FLAGS)
-       Perl_croak(aTHX_ "Unknown Unicode option value 0x%"IVdf,
+       Perl_croak(aTHX_ "Unknown Unicode option value %"UVuf,
 		  (UV) (opt & ~PERL_UNICODE_ALL_FLAGS));
 
   *popt = p;