#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#include <stdarg.h>
+#include <stdint.h>
#include <doldaconnect/uilib.h>
#include <doldaconnect/uimisc.h>
#include <doldaconnect/utils.h>
struct trinfo {
int ostate;
- int opos, spos, speed;
+ intmax_t opos, spos;
+ int speed;
time_t lastprog;
+ int warned;
double sprog;
};
void updatewrite(void);
int remote = 0;
+char *server;
GtkStatusIcon *tray;
pid_t dpid = 0, dcpid = 0;
int connected = 0;
{
struct dc_transfer *tr;
struct trinfo *tri;
- int t, i, a, st, bc, bt;
+ int t, i, a, st;
+ intmax_t bc, bt;
char *buf;
size_t bufsize, bufdata;
if(tri->opos != tr->curpos) {
tri->opos = tr->curpos;
tri->lastprog = now;
+ tri->warned = 0;
}
-#ifdef NOTIFY
- if((tr->state = DC_TRNS_MAIN) && (now - tri->lastprog > 600)) {
- if(dcpid == 0)
+#ifdef HAVE_NOTIFY
+ if((tr->state = DC_TRNS_MAIN) && (now - tri->lastprog > 600) && !tri->warned) {
+ if(dcpid == 0) {
notify(&trnote, "transfer.error", _("Transfer stalled"), _("The transfer of %ls from %ls has not made progress for 10 minutes"), getfilename(tr->path), tr->peernick);
+ tri->warned = 1;
+ }
}
#endif
if((tr->state == DC_TRNS_MAIN) && (dnow - tri->sprog > 10)) {
void connectdc(void)
{
- if((dcfd = dc_connect(remote?NULL:dc_srv_local)) < 0) {
+ if((dcfd = dc_connect(server)) < 0) {
msgbox(GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Could not connect to server: %s"), strerror(errno));
exit(1);
}
{
char pf[1024];
int pfd[2], i;
+ sigset_t ss;
if(getenv("HOME") != NULL)
snprintf(pf, sizeof(pf), "%s/.doldacond.pid", getenv("HOME"));
snprintf(pf, sizeof(pf), "%s/.doldacond.pid", getpwuid(getuid())->pw_dir);
if(access(pf, F_OK) || !running(pf)) {
pipe(pfd);
+ sigemptyset(&ss);
+ sigaddset(&ss, SIGCHLD);
+ sigprocmask(SIG_BLOCK, &ss, NULL);
if((dpid = fork()) == 0) {
+ sigprocmask(SIG_UNBLOCK, &ss, NULL);
dup2(pfd[1], 2);
for(i = 3; i < FD_SETSIZE; i++)
close(i);
create_start_wnd();
gtk_widget_show(start_wnd);
gtk_status_icon_set_tooltip(tray, _("Starting..."));
+ sigprocmask(SIG_UNBLOCK, &ss, NULL);
} else {
connectdc();
}
textdomain(PACKAGE);
signal(SIGCHLD, sighandler);
dc_init();
+ server = dc_srv_local;
gtk_init(&argc, &argv);
#ifdef HAVE_NOTIFY
notify_init("Dolda Connect");
#endif
- while((c = getopt(argc, argv, "rh")) != -1) {
+ while((c = getopt(argc, argv, "Vrhs:")) != -1) {
switch(c) {
case 'r':
remote = 1;
+ server = NULL;
+ break;
+ case 's':
+ remote = 1;
+ server = optarg;
break;
case 'h':
printf("usage: doldacond-shell [-hr]\n");
printf("\t-h\tDisplay this help message\n");
printf("\t-r\tConnect to a remote host\n");
+ printf("\t-V\tDisplay version info and exit\n");
+ exit(0);
+ case 'V':
+ printf("%s", RELEASEINFO);
exit(0);
default:
fprintf(stderr, "usage: doldacond-shell [-hr]\n");