aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2005-11-21 14:17:12 -0800
committerJunio C Hamano <junkio@cox.net>2005-11-21 14:54:33 -0800
commit1b1480ff6acda6e53325961e20fb13ae6895ee69 (patch)
tree0a8441bc998f995dd35380472314802f53c6e1f3
parentf35230fb1123a0db4776c574a874aecec1f38db8 (diff)
downloadgit-1b1480ff6acda6e53325961e20fb13ae6895ee69.tar.gz
git-1b1480ff6acda6e53325961e20fb13ae6895ee69.tar.xz
rename/copy score parsing updates.
Better variant, which handles stuff like "4.5%" and rejects "192.168.0.1". Additionally, make sure numbers are unsigned (I'm making them unsigned long just for the hell of it), to make sure that artificial wraparound scenarios don't cause harm. -hpa [jc: with this, -M100 changes its meaning back to 10%. People wanting to say "pure renames only" should now say -M100% or -M1.0; sounds a bit like an earthquake, but arguably things are more consistent this way ;-)] Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--diff.c33
1 files changed, 21 insertions, 12 deletions
diff --git a/diff.c b/diff.c
index 0f839c11b..ffe8a5523 100644
--- a/diff.c
+++ b/diff.c
@@ -838,29 +838,38 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac)
static int parse_num(const char **cp_p)
{
- int num, scale, ch, cnt;
+ unsigned long num, scale;
+ int ch, dot;
const char *cp = *cp_p;
- cnt = num = 0;
+ num = 0;
scale = 1;
- while ('0' <= (ch = *cp) && ch <= '9') {
- if (cnt++ < 5) {
- /* We simply ignore more than 5 digits precision. */
- scale *= 10;
- num = num * 10 + ch - '0';
+ dot = 0;
+ for(;;) {
+ ch = *cp;
+ if ( !dot && ch == '.' ) {
+ scale = 1;
+ dot = 1;
+ } else if ( ch == '%' ) {
+ scale = dot ? scale*100 : 100;
+ cp++; /* % is always at the end */
+ break;
+ } else if ( ch >= '0' && ch <= '9' ) {
+ if ( scale < 100000 ) {
+ scale *= 10;
+ num = (num*10) + (ch-'0');
+ }
+ } else {
+ break;
}
cp++;
}
*cp_p = cp;
- /* special case: -M100 would mean 1.0 not 0.1 */
- if (num == 100 && scale == 1000)
- return MAX_SCORE;
-
/* user says num divided by scale and we say internally that
* is MAX_SCORE * num / scale.
*/
- return (MAX_SCORE * num / scale);
+ return (num >= scale) ? MAX_SCORE : (MAX_SCORE * num / scale);
}
int diff_scoreopt_parse(const char *opt)