mirror of
https://github.com/profanity-im/profanity.git
synced 2025-01-03 14:57:42 -05:00
add spaces after constructs such as if/for/while
This commit is contained in:
parent
e945347f52
commit
df2726bdf5
@ -801,16 +801,16 @@ cmd_script(ProfWin *window, const char *const command, gchar **args)
|
|||||||
static int
|
static int
|
||||||
_writecsv(int fd, const char *const str)
|
_writecsv(int fd, const char *const str)
|
||||||
{
|
{
|
||||||
if(!str) return 0;
|
if (!str) return 0;
|
||||||
size_t len = strlen(str);
|
size_t len = strlen(str);
|
||||||
char *s = malloc(2 * len * sizeof(char));
|
char *s = malloc(2 * len * sizeof(char));
|
||||||
char *c = s;
|
char *c = s;
|
||||||
int i = 0;
|
int i = 0;
|
||||||
for(; i < strlen(str); i++) {
|
for (; i < strlen(str); i++) {
|
||||||
if(str[i] != '"') *c++ = str[i];
|
if(str[i] != '"') *c++ = str[i];
|
||||||
else { *c++ = '"'; *c++ = '"'; len++; }
|
else { *c++ = '"'; *c++ = '"'; len++; }
|
||||||
}
|
}
|
||||||
if(-1 == write(fd, s, len)) {
|
if (-1 == write(fd, s, len)) {
|
||||||
cons_show("error: failed to write '%s' to the requested file: %s", s, strerror(errno));
|
cons_show("error: failed to write '%s' to the requested file: %s", s, strerror(errno));
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
@ -833,7 +833,7 @@ cmd_export(ProfWin *window, const char *const command, gchar **args)
|
|||||||
int fd;
|
int fd;
|
||||||
|
|
||||||
/* deal with the ~ convention for $HOME */
|
/* deal with the ~ convention for $HOME */
|
||||||
if(args[0][0] == '~') {
|
if (args[0][0] == '~') {
|
||||||
fname = g_string_append(fname, getenv("HOME"));
|
fname = g_string_append(fname, getenv("HOME"));
|
||||||
fname = g_string_append(fname, args[0] + 1);
|
fname = g_string_append(fname, args[0] + 1);
|
||||||
} else {
|
} else {
|
||||||
@ -843,28 +843,28 @@ cmd_export(ProfWin *window, const char *const command, gchar **args)
|
|||||||
fd = open(fname->str, O_WRONLY | O_CREAT, 00600);
|
fd = open(fname->str, O_WRONLY | O_CREAT, 00600);
|
||||||
g_string_free(fname, TRUE);
|
g_string_free(fname, TRUE);
|
||||||
|
|
||||||
if(-1 == fd) {
|
if (-1 == fd) {
|
||||||
cons_show("error: cannot open %s: %s", args[0], strerror(errno));
|
cons_show("error: cannot open %s: %s", args[0], strerror(errno));
|
||||||
cons_show("");
|
cons_show("");
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(-1 == write(fd, "jid,name\n", strlen("jid,name\n"))) goto write_error;
|
if (-1 == write(fd, "jid,name\n", strlen("jid,name\n"))) goto write_error;
|
||||||
|
|
||||||
list = roster_get_contacts(ROSTER_ORD_NAME, TRUE);
|
list = roster_get_contacts(ROSTER_ORD_NAME, TRUE);
|
||||||
if(list) {
|
if (list) {
|
||||||
GSList *curr = list;
|
GSList *curr = list;
|
||||||
while(curr){
|
while (curr){
|
||||||
PContact contact = curr->data;
|
PContact contact = curr->data;
|
||||||
const char *jid = p_contact_barejid(contact);
|
const char *jid = p_contact_barejid(contact);
|
||||||
const char *name = p_contact_name(contact);
|
const char *name = p_contact_name(contact);
|
||||||
|
|
||||||
/* write the data to the file */
|
/* write the data to the file */
|
||||||
if(-1 == write(fd, "\"", 1)) goto write_error;
|
if (-1 == write(fd, "\"", 1)) goto write_error;
|
||||||
if(-1 == _writecsv(fd, jid)) goto write_error;
|
if (-1 == _writecsv(fd, jid)) goto write_error;
|
||||||
if(-1 == write(fd, "\",\"", 3)) goto write_error;
|
if (-1 == write(fd, "\",\"", 3)) goto write_error;
|
||||||
if(-1 == _writecsv(fd, name)) goto write_error;
|
if (-1 == _writecsv(fd, name)) goto write_error;
|
||||||
if(-1 == write(fd, "\"\n", 2)) goto write_error;
|
if (-1 == write(fd, "\"\n", 2)) goto write_error;
|
||||||
|
|
||||||
/* loop */
|
/* loop */
|
||||||
curr = g_slist_next(curr);
|
curr = g_slist_next(curr);
|
||||||
|
Loading…
Reference in New Issue
Block a user