aboutsummaryrefslogtreecommitdiff
path: root/scripts/basic
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2011-01-04 19:56:15 +0700
committerNguyễn Thái Ngọc Duy <pclouds@gmail.com>2011-01-04 19:56:15 +0700
commit5f6f2162512106adf120d4b528bb125e93e34429 (patch)
tree7d7449f755633c263be7125ad58d21cc3ca5b8a7 /scripts/basic
parent9db69882bee2d528d706d61d34ef7741122330be (diff)
parenta116552869db5e7793ae10968eb3c962c69b3d8c (diff)
downloadbusybox-w32-5f6f2162512106adf120d4b528bb125e93e34429.tar.gz
busybox-w32-5f6f2162512106adf120d4b528bb125e93e34429.tar.bz2
busybox-w32-5f6f2162512106adf120d4b528bb125e93e34429.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'scripts/basic')
-rw-r--r--scripts/basic/fixdep.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c
index 1a5b10f84..f27a17984 100644
--- a/scripts/basic/fixdep.c
+++ b/scripts/basic/fixdep.c
@@ -329,7 +329,7 @@ void parse_dep_file(void *map, size_t len)
329 clear_config(); 329 clear_config();
330 330
331 while (m < end) { 331 while (m < end) {
332 while (m < end && (*m == ' ' || *m == '\\' || *m == '\n')) 332 while (m < end && (*m == ' ' || *m == '\\' || *m == '\n' || *m == '\r'))
333 m++; 333 m++;
334 p = m; 334 p = m;
335 while (p < end && *p != ' ') p++; 335 while (p < end && *p != ' ') p++;