git.ucc.asn.au
/
tpg
/
opendispense2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Fixing up logging (slot renames and gives)
[tpg/opendispense2.git]
/
src
/
server
/
server.c
diff --git
a/src/server/server.c
b/src/server/server.c
index
1ebb612
..
158726c
100644
(file)
--- a/
src/server/server.c
+++ b/
src/server/server.c
@@
-253,7
+253,7
@@
void Server_Cleanup(void)
{
printf("\nClose(%i)\n", giServer_Socket);
close(giServer_Socket);
- unlink("/var/run/dispsrv");
+ unlink("/var/run/dispsrv
.pid
");
}
/**
@@
-585,6
+585,10
@@
void Server_int_SendItem(tClient *Client, tItem *Item)
}
}
+ // KNOWN HACK: Naming a slot 'dead' disables it
+ if( strcmp(Item->Name, "dead") == 0 )
+ status = "sold"; // Another status?
+
sendf(Client->Socket,
"202 Item %s:%i %s %i %s\n",
Item->Handler->Name, Item->ID, status, Item->Price, Item->Name
@@
-1318,19
+1322,18
@@
void Server_Cmd_UPDATEITEM(tClient *Client, char *Args)
price = atoi(price_str);
if( price <= 0 && price_str[0] != '0' ) {
- sendf(C
L
ient->Socket, "407 Invalid price set\n");
+ sendf(C
l
ient->Socket, "407 Invalid price set\n");
}
- // Update the item
- free(item->Name);
- item->Name = strdup(description);
- item->Price = price;
-
- // Update item file
- Items_UpdateFile();
-
- // Return OK
- sendf(Client->Socket, "200 Item updated\n");
+ switch( DispenseUpdateItem( Client->UID, item, description, price ) )
+ {
+ case 0:
+ // Return OK
+ sendf(Client->Socket, "200 Item updated\n");
+ break;
+ default:
+ break;
+ }
}
// --- INTERNAL HELPERS ---
UCC
git Repository :: git.ucc.asn.au