projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9ded571
)
don't use a tempfile to store the config use a strbuf. libc will decide when to do...
author
Wilfried Goesgens
<dothebart@citadel.org>
Mon, 14 Nov 2011 00:16:18 +0000
(
01:16
+0100)
committer
Wilfried Goesgens
<dothebart@citadel.org>
Mon, 14 Nov 2011 00:16:18 +0000
(
01:16
+0100)
webcit/roomops.c
patch
|
blob
|
history
diff --git
a/webcit/roomops.c
b/webcit/roomops.c
index f16fb7f585708ed42480570359b96c863edea1e9..85e998bcb77f1bcf52f0c7e6f7df2a3ead0ba8d4 100644
(file)
--- a/
webcit/roomops.c
+++ b/
webcit/roomops.c
@@
-1023,7
+1023,6
@@
void set_room_policy(void) {
* Perform changes to a room's network configuration
*/
void netedit(void) {
* Perform changes to a room's network configuration
*/
void netedit(void) {
- FILE *fp;
char buf[SIZ];
char line[SIZ];
char cmpa0[SIZ];
char buf[SIZ];
char line[SIZ];
char cmpa0[SIZ];
@@
-1032,6
+1031,7
@@
void netedit(void) {
char cmpb1[SIZ];
int i, num_addrs;
StrBuf *Line;
char cmpb1[SIZ];
int i, num_addrs;
StrBuf *Line;
+ StrBuf *TmpBuf;
int Done;
/*/ TODO: do line dynamic! */
int Done;
/*/ TODO: do line dynamic! */
@@
-1058,18
+1058,11
@@
void netedit(void) {
return;
}
return;
}
-
- fp = tmpfile();
- if (fp == NULL) {
- http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
- return;
- }
-
Line = NewStrBuf();
Line = NewStrBuf();
+ TmpBuf = NewStrBuf();
serv_puts("GNET");
StrBuf_ServGetln(Line);
if (GetServerStatus(Line, NULL) != 1) {
serv_puts("GNET");
StrBuf_ServGetln(Line);
if (GetServerStatus(Line, NULL) != 1) {
- fclose(fp);
AppendImportantMessage(SRV_STATUS_MSG(Line));
FreeStrBuf(&Line);
http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
AppendImportantMessage(SRV_STATUS_MSG(Line));
FreeStrBuf(&Line);
http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
@@
-1093,26
+1086,24
@@
void netedit(void) {
if ( (strcasecmp(cmpa0, cmpb0))
|| (strcasecmp(cmpa1, cmpb1)) ) {
StrBufAppendBufPlain(Line, HKEY("\n"), 0);
if ( (strcasecmp(cmpa0, cmpb0))
|| (strcasecmp(cmpa1, cmpb1)) ) {
StrBufAppendBufPlain(Line, HKEY("\n"), 0);
-
fwrite(SKEY(Line), 1, fp
);
+
StrBufAppendBuf(TmpBuf, Line, 0
);
}
}
}
}
}
}
- rewind(fp);
serv_puts("SNET");
StrBuf_ServGetln(Line);
if (GetServerStatus(Line, NULL) != 4) {
serv_puts("SNET");
StrBuf_ServGetln(Line);
if (GetServerStatus(Line, NULL) != 4) {
- fclose(fp);
+
AppendImportantMessage(SRV_STATUS_MSG(Line));
http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
FreeStrBuf(&Line);
AppendImportantMessage(SRV_STATUS_MSG(Line));
http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
FreeStrBuf(&Line);
+ FreeStrBuf(&TmpBuf);
return;
}
return;
}
- while (fgets(buf, sizeof buf, fp) != NULL) {
- buf[strlen(buf)-1] = 0;
- serv_puts(buf);
- }
+ serv_putbuf(TmpBuf);
+ FreeStrBuf(&TmpBuf);
if (havebstr("add_button")) {
num_addrs = num_tokens(bstr("line"), ',');
if (havebstr("add_button")) {
num_addrs = num_tokens(bstr("line"), ',');
@@
-1134,7
+1125,6
@@
void netedit(void) {
}
serv_puts("000");
}
serv_puts("000");
- fclose(fp);
FlushIgnetCfgs(&WC->CurRoom);
FreeStrBuf(&Line);
FlushIgnetCfgs(&WC->CurRoom);
FreeStrBuf(&Line);