aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2018-06-01 17:00:39 +0000
committerAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2018-06-01 17:00:39 +0000
commit7376275cd523ed4f03e20701ce8cd6db9dc1f441 (patch)
tree0ee96fa224ee374a153d877f3d1c83e331b3242c
parent4be2b9d40f9be0da59c3f85db1ee4d656c49c95c (diff)
parent52687e5f11037c6b8b214a823abfbffc5c26cd01 (diff)
downloadandroid_external_e2fsprogs-7376275cd523ed4f03e20701ce8cd6db9dc1f441.tar.gz
android_external_e2fsprogs-7376275cd523ed4f03e20701ce8cd6db9dc1f441.tar.bz2
android_external_e2fsprogs-7376275cd523ed4f03e20701ce8cd6db9dc1f441.zip
[automerger] Ignore quotes in safe_print(). am: efe90c297a am: fba371f070 am: 04bc663e2b am: 1fcb8d205d am: 1cfb5670e4 am: 387016b397 am: 52687e5f11
Change-Id: Ifa56c15c7d2b7672bc40e361d1eb6affe2212d1b
-rw-r--r--misc/blkid.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/misc/blkid.c b/misc/blkid.c
index 388abad0..248cacf6 100644
--- a/misc/blkid.c
+++ b/misc/blkid.c
@@ -86,7 +86,9 @@ static void safe_print(const char *cp, int len)
fputc('^', stdout);
ch ^= 0x40; /* ^@, ^A, ^B; ^? for DEL */
}
- fputc(ch, stdout);
+ if (ch != '"') {
+ fputc(ch, stdout);
+ }
}
}