[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 18:03:13 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 1bf18f07129636e70a43adcd395bf10a83011eb7
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Dec 6 18:46:33 2010 +0000
2010-12-06 John Tantalo <john.tantalo at gmail.com>
Reviewed by Geoffrey Garen.
jsc does not ignore shebang
https://bugs.webkit.org/show_bug.cgi?id=49576
* jsc.cpp:
(fillBufferWithContentsOfFile):
- translate shebang into a valid JavaScript comment so the lexer ignores it
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73377 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index aa4fa32..e734de5 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-12-06 John Tantalo <john.tantalo at gmail.com>
+
+ Reviewed by Geoffrey Garen.
+
+ jsc does not ignore shebang
+ https://bugs.webkit.org/show_bug.cgi?id=49576
+
+ * jsc.cpp:
+ (fillBufferWithContentsOfFile):
+ - translate shebang into a valid JavaScript comment so the lexer ignores it
+
2010-12-05 Adam Roben <aroben at apple.com>
Windows production build fix
diff --git a/JavaScriptCore/jsc.cpp b/JavaScriptCore/jsc.cpp
index 5439bad..dd4b677 100644
--- a/JavaScriptCore/jsc.cpp
+++ b/JavaScriptCore/jsc.cpp
@@ -561,5 +561,8 @@ static bool fillBufferWithContentsOfFile(const UString& fileName, Vector<char>&
fclose(f);
buffer[bufferSize] = '\0';
+ if (buffer[0] == '#' && buffer[1] == '!')
+ buffer[0] = buffer[1] = '/';
+
return true;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list