about summary refs log tree commit diff stats
path: root/src
diff options
context:
space:
mode:
authorMichael Vetter <jubalh@iodoru.org>2022-02-24 11:57:25 +0100
committerMichael Vetter <jubalh@iodoru.org>2022-02-24 11:57:25 +0100
commit6d17b36605292a0eda148178677f72819c80b6fe (patch)
treecdc0e9c6cb81b2592ded9c1e470d1d88fe667cf5 /src
parent8173878bc7ce5b502a967186f847c8f7cf33ed72 (diff)
downloadprofani-tty-6d17b36605292a0eda148178677f72819c80b6fe.tar.gz
ox: expand file and check for existance before trying to announce
Output before:
```
11:00:00 - Annonuce OpenPGP Key for OX ~/test/testuser.pub.gpg ...
```

After:
```
11:00:00 - Annonuce OpenPGP Key for OX /home/user/test/testuser.pub.gpg ...
```

Now we expand the path so that we can check for `~` properly.
And test if the file is actually a normal file.
Diffstat (limited to 'src')
-rw-r--r--src/command/cmd_funcs.c17
1 files changed, 16 insertions, 1 deletions
diff --git a/src/command/cmd_funcs.c b/src/command/cmd_funcs.c
index 4b79b145..0219b61f 100644
--- a/src/command/cmd_funcs.c
+++ b/src/command/cmd_funcs.c
@@ -7613,7 +7613,22 @@ cmd_ox(ProfWin* window, const char* const command, gchar** args)
         return TRUE;
     } else if (g_strcmp0(args[0], "announce") == 0) {
         if (args[1]) {
-            ox_announce_public_key(args[1]);
+            gchar* filename = get_expanded_path(args[1]);
+
+            if (access(filename, R_OK) != 0) {
+                cons_show_error("File not found: %s", filename);
+                g_free(filename);
+                return TRUE;
+            }
+
+            if (!is_regular_file(filename)) {
+                cons_show_error("Not a file: %s", filename);
+                g_free(filename);
+                return TRUE;
+            }
+
+            ox_announce_public_key(filename);
+            free(filename);
         } else {
             cons_show("Filename is required");
         }
4ac3c9e ^
ac07e589 ^





2187d42a ^

a654e4ec ^



e5c11a51 ^






















a654e4ec ^

2187d42a ^
e5c11a51 ^
e4ac3c9e ^
a654e4ec ^
204dae92 ^










51728d93 ^
e4ac3c9e ^
204dae92 ^
e4ac3c9e ^
204dae92 ^




5fe060d5 ^
204dae92 ^
e4ac3c9e ^
204dae92 ^






e4ac3c9e ^

204dae92 ^























































2187d42a ^


a654e4ec ^
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
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149