/* bsys.c */
char *bstrncpy (char *dest, const char *src, int maxlen);
+char *bstrncpy (char *dest, POOL_MEM &src, int maxlen);
char *bstrncat (char *dest, const char *src, int maxlen);
-void *b_malloc (char *file, int line, size_t size);
+char *bstrncat (char *dest, POOL_MEM &src, int maxlen);
+void *b_malloc (const char *file, int line, size_t size);
#ifndef DEBUG
void *bmalloc (size_t size);
#endif
void *brealloc (void *buf, size_t size);
void *bcalloc (size_t size1, size_t size2);
-int bsnprintf (char *str, int32_t size, const char *format, ...);
-int bvsnprintf (char *str, int32_t size, const char *format, va_list ap);
-int pool_sprintf (char *pool_buf, char *fmt, ...);
-void create_pid_file (char *dir, char *progname, int port);
-int delete_pid_file (char *dir, char *progname, int port);
+int bsnprintf (char *str, int32_t size, const char *format, ...);
+int bvsnprintf (char *str, int32_t size, const char *format, va_list ap);
+int pool_sprintf (char *pool_buf, const char *fmt, ...);
+void create_pid_file (char *dir, const char *progname, int port);
+int delete_pid_file (char *dir, const char *progname, int port);
void drop (char *uid, char *gid);
int bmicrosleep (time_t sec, long usec);
char *bfgets (char *s, int size, FILE *fd);
#ifndef HAVE_STRTOLL
long long int strtoll (const char *ptr, char **endptr, int base);
#endif
+void read_state_file(char *dir, const char *progname, int port);
+int bstrerror(int errnum, char *buf, size_t bufsiz);
/* bnet.c */
int32_t bnet_recv (BSOCK *bsock);
-int bnet_send (BSOCK *bsock);
-int bnet_fsend (BSOCK *bs, char *fmt, ...);
-int bnet_set_buffer_size (BSOCK *bs, uint32_t size, int rw);
-int bnet_sig (BSOCK *bs, int sig);
+bool bnet_send (BSOCK *bsock);
+bool bnet_fsend (BSOCK *bs, const char *fmt, ...);
+bool bnet_set_buffer_size (BSOCK *bs, uint32_t size, int rw);
+bool bnet_sig (BSOCK *bs, int sig);
int bnet_ssl_server (BSOCK *bsock, char *password, int ssl_need, int ssl_has);
int bnet_ssl_client (BSOCK *bsock, char *password, int ssl_need);
BSOCK * bnet_connect (JCR *jcr, int retry_interval,
- int max_retry_time, char *name, char *host, char *service,
+ int max_retry_time, const char *name, char *host, char *service,
int port, int verbose);
void bnet_close (BSOCK *bsock);
-BSOCK * init_bsock (JCR *jcr, int sockfd, char *who, char *ip, int port);
+BSOCK * init_bsock (JCR *jcr, int sockfd, const char *who, const char *ip,
+ int port, struct sockaddr *client_addr);
BSOCK * dup_bsock (BSOCK *bsock);
void term_bsock (BSOCK *bsock);
char * bnet_strerror (BSOCK *bsock);
-char * bnet_sig_to_ascii (BSOCK *bsock);
+const char *bnet_sig_to_ascii (BSOCK *bsock);
int bnet_wait_data (BSOCK *bsock, int sec);
int bnet_wait_data_intr (BSOCK *bsock, int sec);
-int bnet_despool (BSOCK *bsock);
-int is_bnet_stop (BSOCK *bsock);
+int bnet_despool_to_bsock (BSOCK *bsock, void update(ssize_t size), ssize_t size);
+bool is_bnet_stop (BSOCK *bsock);
int is_bnet_error (BSOCK *bsock);
-void bnet_suppress_error_messages(BSOCK *bsock, int flag);
+void bnet_suppress_error_messages(BSOCK *bsock, bool flag);
+dlist *bnet_host2ipaddrs(const char *host, int family, const char **errstr);
/* bget_msg.c */
int bget_msg(BSOCK *sock);
/* bpipe.c */
-BPIPE * open_bpipe(char *prog, int wait, char *mode);
+BPIPE * open_bpipe(char *prog, int wait, const char *mode);
int close_wpipe(BPIPE *bpipe);
int close_bpipe(BPIPE *bpipe);
char * edit_uint64 (uint64_t val, char *buf);
int duration_to_utime (char *str, utime_t *value);
int size_to_uint64(char *str, int str_len, uint64_t *rtn_value);
-char *edit_utime (utime_t val, char *buf);
-int is_a_number (const char *num);
-int is_an_integer (const char *n);
+char *edit_utime (utime_t val, char *buf, int buf_len);
+bool is_a_number (const char *num);
+bool is_an_integer (const char *n);
bool is_name_valid (char *name, POOLMEM **msg);
/* jcr.c (most definitions are in src/jcr.h) */
void term_last_jobs_list();
void lock_last_jobs_list();
void unlock_last_jobs_list();
+void read_last_jobs_list(int fd, uint64_t addr);
+uint64_t write_last_jobs_list(int fd, uint64_t addr);
+void write_state_file(char *dir, const char *progname, int port);
+void job_end_push(JCR *jcr, void job_end_cb(JCR *jcr,void *), void *ctx);
/* lex.c */
LEX * lex_close_file (LEX *lf);
-LEX * lex_open_file (LEX *lf, char *fname, LEX_ERROR_HANDLER *scan_error);
+LEX * lex_open_file (LEX *lf, const char *fname, LEX_ERROR_HANDLER *scan_error);
int lex_get_char (LEX *lf);
void lex_unget_char (LEX *lf);
-char * lex_tok_to_str (int token);
+const char * lex_tok_to_str (int token);
int lex_get_token (LEX *lf, int expect);
/* message.c */
-void my_name_is (int argc, char *argv[], char *name);
+void my_name_is (int argc, char *argv[], const char *name);
void init_msg (JCR *jcr, MSGS *msg);
void term_msg (void);
void close_msg (JCR *jcr);
void add_msg_dest (MSGS *msg, int dest, int type, char *where, char *dest_code);
void rem_msg_dest (MSGS *msg, int dest, int type, char *where);
-void Jmsg (JCR *jcr, int type, int level, char *fmt, ...);
+void Jmsg (JCR *jcr, int type, int level, const char *fmt, ...);
void dispatch_message (JCR *jcr, int type, int level, char *buf);
-void init_console_msg (char *wd);
+void init_console_msg (const char *wd);
void free_msgs_res (MSGS *msgs);
-int open_spool_file (JCR *jcr, BSOCK *bs);
-int close_spool_file (JCR *jcr, BSOCK *bs);
-
+void dequeue_messages (JCR *jcr);
+void set_trace (int trace_flag);
+void set_exit_on_error (int value);
/* bnet_server.c */
-void bnet_thread_server(char *bind_addr, int port, int max_clients, workq_t *client_wq,
+void bnet_thread_server(dlist *addr, int max_clients, workq_t *client_wq,
void *handle_client_request(void *bsock));
+void bnet_stop_thread_server(pthread_t tid);
void bnet_server (int port, void handle_client_request(BSOCK *bsock));
int net_connect (int port);
BSOCK * bnet_bind (int port);
void strip_trailing_slashes (char *dir);
bool skip_spaces (char **msg);
bool skip_nonspaces (char **msg);
-int fstrsch (char *a, char *b);
+int fstrsch (const char *a, const char *b);
+char *next_arg(char **s);
int parse_args(POOLMEM *cmd, POOLMEM **args, int *argc,
char **argk, char **argv, int max_args);
-char *next_arg(char **s);
+void split_path_and_filename(const char *fname, POOLMEM **path,
+ int *pnl, POOLMEM **file, int *fnl);
+int bsscanf(const char *buf, const char *fmt, ...);
+
/* util.c */
int is_buf_zero (char *buf, int len);
void lcase (char *str);
void bash_spaces (char *str);
+void bash_spaces (POOL_MEM &pm);
void unbash_spaces (char *str);
+void unbash_spaces (POOL_MEM &pm);
char * encode_time (time_t time, char *buf);
char * encode_mode (mode_t mode, char *buf);
int do_shell_expansion (char *name, int name_len);
void jobstatus_to_ascii (int JobStatus, char *msg, int maxlen);
-int pm_strcat (POOLMEM **pm, char *str);
-int pm_strcpy (POOLMEM **pm, char *str);
int run_program (char *prog, int wait, POOLMEM *results);
-char * job_type_to_str (int type);
-char * job_status_to_str (int stat);
-char * job_level_to_str (int level);
+const char * job_type_to_str (int type);
+const char * job_status_to_str (int stat);
+const char * job_level_to_str (int level);
void make_session_key (char *key, char *seed, int mode);
-POOLMEM *edit_job_codes(JCR *jcr, char *omsg, char *imsg, char *to);
+POOLMEM *edit_job_codes(JCR *jcr, char *omsg, char *imsg, const char *to);
void set_working_directory(char *wd);
/* watchdog.c */
int start_watchdog(void);
int stop_watchdog(void);
-watchdog_t *watchdog_new(void);
+watchdog_t *new_watchdog(void);
bool register_watchdog(watchdog_t *wd);
bool unregister_watchdog(watchdog_t *wd);
bool unregister_watchdog_unlocked(watchdog_t *wd);
/* timers.c */
-btimer_id start_child_timer(pid_t pid, uint32_t wait);
-void stop_child_timer(btimer_id wid);
-btimer_id start_thread_timer(pthread_t tid, uint32_t wait);
-void stop_thread_timer(btimer_id wid);
+btimer_t *start_child_timer(pid_t pid, uint32_t wait);
+void stop_child_timer(btimer_t *wid);
+btimer_t *start_thread_timer(pthread_t tid, uint32_t wait);
+void stop_thread_timer(btimer_t *wid);
+btimer_t *start_bsock_timer(BSOCK *bs, uint32_t wait);
+void stop_bsock_timer(btimer_t *wid);