* file named AUTHORS, in the root directory of this distribution.
*/
/*
- * $Id: packet.c,v 1.8 2006/05/25 01:47:12 johnfranks Exp $
+ * $Id: packet.c,v 1.8.2.4 2006/12/18 20:43:50 martinea Exp $
*
* Routines for modifying the amanda protocol packet type
*/
/*
* Initialize a packet
*/
+void pkt_init_empty(
+ pkt_t *pkt,
+ pktype_t type)
+{
+ assert(pkt != NULL);
+ assert(strcmp(pkt_type2str(type), "BOGUS") != 0);
+
+ pkt->type = type;
+ pkt->packet_size = 1000;
+ pkt->body = alloc(pkt->packet_size);
+ pkt->body[0] = '\0';
+ pkt->size = strlen(pkt->body);
+}
+
printf_arglist_function2(void pkt_init, pkt_t *, pkt, pktype_t, type,
const char *, fmt)
{
va_list argp;
+ int len;
assert(pkt != NULL);
assert(strcmp(pkt_type2str(type), "BOGUS") != 0);
pkt->type = type;
pkt->packet_size = 1000;
pkt->body = alloc(pkt->packet_size);
- arglist_start(argp, fmt);
- while (vsnprintf(pkt->body, pkt->packet_size, fmt, argp) >=
- (int)(pkt->packet_size - 1)) {
+ while(1) {
+ arglist_start(argp, fmt);
+ len = vsnprintf(pkt->body, pkt->packet_size, fmt, argp);
+ arglist_end(argp);
+ if (len > -1 && len < (int)(pkt->packet_size - 1))
+ break;
pkt->packet_size *= 2;
amfree(pkt->body);
pkt->body = alloc(pkt->packet_size);
}
- arglist_end(argp);
pkt->size = strlen(pkt->body);
}
printf_arglist_function1(void pkt_cat, pkt_t *, pkt, const char *, fmt)
{
size_t len;
+ int lenX;
va_list argp;
char * pktbody;
len = strlen(pkt->body);
- arglist_start(argp, fmt);
- while (vsnprintf(pkt->body + len, pkt->packet_size - len, fmt,argp) >=
- (int)(pkt->packet_size - len - 1)) {
+ while(1) {
+ arglist_start(argp, fmt);
+ lenX = vsnprintf(pkt->body + len, pkt->packet_size - len, fmt,argp);
+ arglist_end(argp);
+ if (lenX > -1 && lenX < (int)(pkt->packet_size - len - 1))
+ break;
pkt->packet_size *= 2;
pktbody = alloc(pkt->packet_size);
strncpy(pktbody, pkt->body, len);
pktbody[len] = '\0';
amfree(pkt->body);
pkt->body = pktbody;
- arglist_end(argp);
- arglist_start(argp, fmt);
}
- arglist_end(argp);
pkt->size = strlen(pkt->body);
}