From: Junio C Hamano <junkio@cox.net>
To: Linus Torvalds <torvalds@osdl.org>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: [PATCH 3/4] diff: Clean up diff_scoreopt_parse().
Date: Fri, 03 Jun 2005 01:37:54 -0700 [thread overview]
Message-ID: <7v1x7jq1i5.fsf_-_@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <7vis0vq1rz.fsf_-_@assigned-by-dhcp.cox.net> (Junio C. Hamano's message of "Fri, 03 Jun 2005 01:32:00 -0700")
This cleans up diff_scoreopt_parse() function that is used to
parse the fractional notation -B, -C and -M option takes. The
callers are modified to check for errors and complain. Earlier
they silently ignored malformed input and falled back on the
default.
Signed-off-by: Junio C Hamano <junkio@cox.net>
---
diff-cache.c | 9 ++++++---
diff-files.c | 15 +++++++++++----
diff-tree.c | 9 ++++++---
diff.c | 39 +++++++++++++++++++++++++++++++++++++++
diffcore-rename.c | 18 ------------------
5 files changed, 62 insertions(+), 28 deletions(-)
diff --git a/diff-cache.c b/diff-cache.c
--- a/diff-cache.c
+++ b/diff-cache.c
@@ -191,17 +191,20 @@ int main(int argc, const char **argv)
continue;
}
if (!strncmp(arg, "-B", 2)) {
- diff_break_opt = diff_scoreopt_parse(arg);
+ if ((diff_break_opt = diff_scoreopt_parse(arg)) == -1)
+ usage(diff_cache_usage);
continue;
}
if (!strncmp(arg, "-M", 2)) {
detect_rename = DIFF_DETECT_RENAME;
- diff_score_opt = diff_scoreopt_parse(arg);
+ if ((diff_score_opt = diff_scoreopt_parse(arg)) == -1)
+ usage(diff_cache_usage);
continue;
}
if (!strncmp(arg, "-C", 2)) {
detect_rename = DIFF_DETECT_COPY;
- diff_score_opt = diff_scoreopt_parse(arg);
+ if ((diff_score_opt = diff_scoreopt_parse(arg)) == -1)
+ usage(diff_cache_usage);
continue;
}
if (!strcmp(arg, "-z")) {
diff --git a/diff-files.c b/diff-files.c
--- a/diff-files.c
+++ b/diff-files.c
@@ -61,14 +61,21 @@ int main(int argc, const char **argv)
orderfile = argv[1] + 2;
else if (!strcmp(argv[1], "--pickaxe-all"))
pickaxe_opts = DIFF_PICKAXE_ALL;
- else if (!strncmp(argv[1], "-B", 2))
- diff_break_opt = diff_scoreopt_parse(argv[1]);
+ else if (!strncmp(argv[1], "-B", 2)) {
+ if ((diff_break_opt =
+ diff_scoreopt_parse(argv[1])) == -1)
+ usage(diff_files_usage);
+ }
else if (!strncmp(argv[1], "-M", 2)) {
- diff_score_opt = diff_scoreopt_parse(argv[1]);
+ if ((diff_score_opt =
+ diff_scoreopt_parse(argv[1])) == -1)
+ usage(diff_files_usage);
detect_rename = DIFF_DETECT_RENAME;
}
else if (!strncmp(argv[1], "-C", 2)) {
- diff_score_opt = diff_scoreopt_parse(argv[1]);
+ if ((diff_score_opt =
+ diff_scoreopt_parse(argv[1])) == -1)
+ usage(diff_files_usage);
detect_rename = DIFF_DETECT_COPY;
}
else
diff --git a/diff-tree.c b/diff-tree.c
--- a/diff-tree.c
+++ b/diff-tree.c
@@ -459,16 +459,19 @@ int main(int argc, const char **argv)
}
if (!strncmp(arg, "-M", 2)) {
detect_rename = DIFF_DETECT_RENAME;
- diff_score_opt = diff_scoreopt_parse(arg);
+ if ((diff_score_opt = diff_scoreopt_parse(arg)) == -1)
+ usage(diff_tree_usage);
continue;
}
if (!strncmp(arg, "-C", 2)) {
detect_rename = DIFF_DETECT_COPY;
- diff_score_opt = diff_scoreopt_parse(arg);
+ if ((diff_score_opt = diff_scoreopt_parse(arg)) == -1)
+ usage(diff_tree_usage);
continue;
}
if (!strncmp(arg, "-B", 2)) {
- diff_break_opt = diff_scoreopt_parse(arg);
+ if ((diff_break_opt = diff_scoreopt_parse(arg)) == -1)
+ usage(diff_tree_usage);
continue;
}
if (!strcmp(arg, "-z")) {
diff --git a/diff.c b/diff.c
--- a/diff.c
+++ b/diff.c
@@ -589,6 +589,45 @@ void diff_setup(int flags)
}
+static int parse_num(const char **cp_p)
+{
+ int num, scale, ch, cnt;
+ const char *cp = *cp_p;
+
+ cnt = 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';
+ }
+ *cp++;
+ }
+ *cp_p = cp;
+
+ /* user says num divided by scale and we say internally that
+ * is MAX_SCORE * num / scale.
+ */
+ return (MAX_SCORE * num / scale);
+}
+
+int diff_scoreopt_parse(const char *opt)
+{
+ int opt1, cmd;
+
+ if (*opt++ != '-')
+ return -1;
+ cmd = *opt++;
+ if (cmd != 'M' && cmd != 'C' && cmd != 'B')
+ return -1; /* that is not a -M, -C nor -B option */
+
+ opt1 = parse_num(&opt);
+ if (*opt != 0)
+ return -1;
+ return opt1;
+}
+
struct diff_queue_struct diff_queued_diff;
void diff_q(struct diff_queue_struct *queue, struct diff_filepair *dp)
diff --git a/diffcore-rename.c b/diffcore-rename.c
--- a/diffcore-rename.c
+++ b/diffcore-rename.c
@@ -229,24 +229,6 @@ static int score_compare(const void *a_,
return b->score - a->score;
}
-int diff_scoreopt_parse(const char *opt)
-{
- int diglen, num, scale, i;
- if (opt[0] != '-' || (opt[1] != 'M' && opt[1] != 'C' && opt[1] != 'B'))
- return -1; /* that is not a -M, -C nor -B option */
- diglen = strspn(opt+2, "0123456789");
- if (diglen == 0 || strlen(opt+2) != diglen)
- return 0; /* use default */
- sscanf(opt+2, "%d", &num);
- for (i = 0, scale = 1; i < diglen; i++)
- scale *= 10;
-
- /* user says num divided by scale and we say internally that
- * is MAX_SCORE * num / scale.
- */
- return MAX_SCORE * num / scale;
-}
-
void diffcore_rename(int detect_rename, int minimum_score)
{
struct diff_queue_struct *q = &diff_queued_diff;
------------
next prev parent reply other threads:[~2005-06-03 8:35 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-05-30 20:00 I want to release a "git-1.0" Linus Torvalds
2005-05-30 20:33 ` jeff millar
2005-05-30 20:49 ` Nicolas Pitre
2005-06-01 6:52 ` Junio C Hamano
2005-06-01 8:24 ` [PATCH] Add -d flag to git-pull-* family Junio C Hamano
2005-06-01 14:39 ` Nicolas Pitre
2005-06-01 16:00 ` Junio C Hamano
[not found] ` <7v1x7lk8fl.fsf_-_@assigned-by-dhcp.cox.net>
2005-06-02 0:47 ` [PATCH] Handle deltified object correctly in git-*-pull family Nicolas Pitre
[not found] ` <7vpsv5hbm5.fsf@assigned-by-dhcp.cox.net>
2005-06-02 0:51 ` [PATCH] Stop inflating the whole SHA1 file only to check size Nicolas Pitre
2005-06-02 1:32 ` Junio C Hamano
2005-06-02 0:58 ` [PATCH] Handle deltified object correctly in git-*-pull family Linus Torvalds
2005-06-02 1:43 ` Junio C Hamano
2005-05-30 20:59 ` I want to release a "git-1.0" Junio C Hamano
2005-05-30 21:07 ` Junio C Hamano
2005-05-30 22:11 ` David Greaves
2005-05-30 22:12 ` Dave Jones
2005-05-30 22:55 ` Dmitry Torokhov
2005-05-30 23:15 ` Junio C Hamano
2005-05-30 23:23 ` Dmitry Torokhov
2005-05-31 0:52 ` Linus Torvalds
2005-05-30 22:19 ` Ryan Anderson
2005-05-31 0:58 ` Linus Torvalds
2005-05-30 22:32 ` Chris Wedgwood
2005-05-30 23:56 ` Chris Wedgwood
2005-05-31 1:06 ` Linus Torvalds
2005-06-01 2:11 ` Junio C Hamano
2005-06-01 2:25 ` David Lang
2005-06-01 4:53 ` Junio C Hamano
2005-06-01 20:06 ` David Lang
2005-06-01 20:16 ` C. Scott Ananian
2005-06-02 0:43 ` Nicolas Pitre
2005-06-02 1:14 ` Brian O'Mahoney
2005-06-01 23:03 ` Junio C Hamano
2005-05-31 0:19 ` Petr Baudis
2005-05-31 13:45 ` Eric W. Biederman
2005-06-01 3:04 ` Linus Torvalds
2005-06-01 4:06 ` Junio C Hamano
2005-06-02 23:54 ` [PATCH] Fix -B "very-different" logic Junio C Hamano
2005-06-03 0:21 ` Linus Torvalds
2005-06-03 1:33 ` Junio C Hamano
2005-06-03 8:32 ` [PATCH 0/4] " Junio C Hamano
2005-06-03 8:36 ` [PATCH 1/4] Tweak count-delta interface Junio C Hamano
2005-06-03 8:36 ` [PATCH 2/4] diff: Fix docs and add -O to diff-helper Junio C Hamano
2005-06-03 8:37 ` Junio C Hamano [this message]
2005-06-03 8:40 ` [PATCH 4/4] diff: Update -B heuristics Junio C Hamano
2005-06-01 6:28 ` I want to release a "git-1.0" Junio C Hamano
2005-06-01 22:00 ` Daniel Barkalow
2005-06-01 23:05 ` Junio C Hamano
2005-06-03 9:47 ` Petr Baudis
2005-06-03 15:09 ` Daniel Barkalow
2005-06-02 7:15 ` Eric W. Biederman
2005-06-02 8:32 ` Kay Sievers
2005-06-02 14:52 ` Linus Torvalds
2005-06-02 12:02 ` [PATCH] several typos in tutorial Alexey Nezhdanov
2005-06-02 12:41 ` Vincent Hanquez
2005-06-02 12:45 ` Alexey Nezhdanov
2005-06-02 12:51 ` Vincent Hanquez
2005-06-02 12:56 ` Alexey Nezhdanov
2005-06-02 13:00 ` Alexey Nezhdanov
2005-06-02 23:40 ` I want to release a "git-1.0" Adam Kropelin
2005-06-03 0:06 ` Linus Torvalds
2005-06-03 0:47 ` Linus Torvalds
2005-06-03 1:34 ` Adam Kropelin
2005-06-02 19:43 ` CVS migration section to the tutorial Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7v1x7jq1i5.fsf_-_@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=git@vger.kernel.org \
--cc=torvalds@osdl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).