1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
|
From 9ea93e0e1117d6acdbd3a7133fdb60914b9845b2 Mon Sep 17 00:00:00 2001
From: Nikias Bassen <nikias@gmx.li>
Date: Mon, 23 May 2022 02:50:55 +0200
Subject: [PATCH 2/2] ipsw: Update to reflect color macro name change in
libimobiledevice-glue
---
src/ipsw.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/ipsw.c b/src/ipsw.c
index f3b7f57..6887003 100644
--- a/src/ipsw.c
+++ b/src/ipsw.c
@@ -150,10 +150,10 @@ int ipsw_print_info(const char* path)
plist_get_string_val(val, &build_ver);
}
- cprintf(COLOR_WHITE "Product Version: " COLOR_BRIGHT_YELLOW "%s" COLOR_RESET COLOR_WHITE " Build: " COLOR_BRIGHT_YELLOW "%s" COLOR_RESET "\n", prod_ver, build_ver);
+ cprintf(FG_WHITE "Product Version: " FG_BRIGHT_YELLOW "%s" COLOR_RESET FG_WHITE " Build: " FG_BRIGHT_YELLOW "%s" COLOR_RESET "\n", prod_ver, build_ver);
free(prod_ver);
free(build_ver);
- cprintf(COLOR_WHITE "Supported Product Types:" COLOR_RESET);
+ cprintf(FG_WHITE "Supported Product Types:" COLOR_RESET);
val = plist_dict_get_item(manifest, "SupportedProductTypes");
if (val) {
plist_array_iter iter = NULL;
@@ -165,7 +165,7 @@ int ipsw_print_info(const char* path)
if (item) {
char* item_str = NULL;
plist_get_string_val(item, &item_str);
- cprintf(" " COLOR_BRIGHT_CYAN "%s" COLOR_RESET, item_str);
+ cprintf(" " FG_BRIGHT_CYAN "%s" COLOR_RESET, item_str);
free(item_str);
}
} while (item);
@@ -174,7 +174,7 @@ int ipsw_print_info(const char* path)
}
cprintf("\n");
- cprintf(COLOR_WHITE "Build Identities:" COLOR_RESET "\n");
+ cprintf(FG_WHITE "Build Identities:" COLOR_RESET "\n");
plist_t build_ids_grouped = plist_new_dict();
@@ -230,7 +230,7 @@ int ipsw_print_info(const char* path)
group_no++;
node = plist_dict_get_item(group, "RestoreBehavior");
plist_get_string_val(node, &rbehavior);
- cprintf(" " COLOR_WHITE "[%d] Variant: " COLOR_BRIGHT_CYAN "%s" COLOR_WHITE " Behavior: " COLOR_BRIGHT_CYAN "%s" COLOR_RESET "\n", group_no, key, rbehavior);
+ cprintf(" " FG_WHITE "[%d] Variant: " FG_BRIGHT_CYAN "%s" FG_WHITE " Behavior: " FG_BRIGHT_CYAN "%s" COLOR_RESET "\n", group_no, key, rbehavior);
free(key);
free(rbehavior);
@@ -283,9 +283,9 @@ int ipsw_print_info(const char* path)
irecv_device_t irecvdev = NULL;
if (irecv_devices_get_device_by_hardware_model(hwmodel, &irecvdev) == 0) {
- cprintf(" ChipID: " COLOR_GREEN "%04x" COLOR_RESET " BoardID: " COLOR_GREEN "%02x" COLOR_RESET " Model: " COLOR_YELLOW "%-8s" COLOR_RESET " " COLOR_MAGENTA "%s" COLOR_RESET "\n", (int)chip_id, (int)board_id, hwmodel, irecvdev->display_name);
+ cprintf(" ChipID: " FG_GREEN "%04x" COLOR_RESET " BoardID: " FG_GREEN "%02x" COLOR_RESET " Model: " FG_YELLOW "%-8s" COLOR_RESET " " FG_MAGENTA "%s" COLOR_RESET "\n", (int)chip_id, (int)board_id, hwmodel, irecvdev->display_name);
} else {
- cprintf(" ChipID: " COLOR_GREEN "%04x" COLOR_RESET " BoardID: " COLOR_GREEN "%02x" COLOR_RESET " Model: " COLOR_YELLOW "%s" COLOR_RESET "\n", (int)chip_id, (int)board_id, hwmodel);
+ cprintf(" ChipID: " FG_GREEN "%04x" COLOR_RESET " BoardID: " FG_GREEN "%02x" COLOR_RESET " Model: " FG_YELLOW "%s" COLOR_RESET "\n", (int)chip_id, (int)board_id, hwmodel);
}
free(hwmodel);
} while (build_id);
--
2.37.1
|