Mercurial > hg > xemacs-beta
view netinstall/geturl.cc @ 5494:861f2601a38b
Sync s/ files with GNU 23.1.92, delete obsolete stuff, simplify other stuff
--- ChangeLog
2010-02-20 Ben Wing <ben@xemacs.org>
* configure:
* configure.ac (XE_EXPAND_VARIABLE):
* configure.ac (TAB):
irix6-0.h renamed to irix6-5.h; sco7.h deleted.
bsd4-3.h renamed to bsd-common.h.
Simplify setting machine= for intel386, mips.
Put back linux.h.
Incorporate some stuff about debug/optimization flags in irix6-5.h
into configure.ac.
Add a comment about LCC stuff with optimization flags that should be
fixed up.
--- src/ChangeLog
2010-02-20 Ben Wing <ben@xemacs.org>
* sysdep.c:
* sysdep.c (qxe_reliable_signal):
* sysdep.c (retry_open_1):
* sysdep.c (retry_close):
* sysdep.c (retry_read_1):
* sysdep.c (retry_write_1):
* sysdep.c (retry_fopen):
* sysdep.c (retry_fclose):
* sysdep.c (retry_fread):
* sysdep.c (retry_fwrite):
Remove conditionalization on INTERRUPTIBLE_IO, INTERRUPTIBLE_OPEN,
INTERRUPTIBLE_CLOSE -- always check for EINTR as there's no harm
in it.
Remove old #if 0'ed out SA_RESTART code.
Use manifest constant IRIX6_5 instead of IRIX.
* Makefile.in.in:
* dired.c:
* dired.c (Ffile_attributes):
Use manifest constant IRIX6_5 instead of IRIX.
Eliminate constant BSD4_2, use BSD4_3 instead.
* getloadavg.c:
* getloadavg.c (getloadavg):
* getloadavg.c (LDAV_PRIVILEGED):
* getloadavg.c (LDAV_DONE):
Sync with GNU 23.1.92.
2010-02-20 Ben Wing <ben@xemacs.org>
* s/README:
* s/aix4-2.h:
* s/aix4-2.h (MAIL_USE_LOCKF):
* s/bsd-common.h:
* s/freebsd.h:
* s/freebsd.h (Carey):
* s/freebsd.h (or):
* s/gnu.h:
* s/gnu.h (DATA_START):
* s/hpux11-shr.h:
* s/hpux11.h:
* s/hpux11.h (random):
* s/irix6-5.h:
* s/linux.h:
* s/mach-bsd4-3.h:
* s/netbsd.h:
* s/netbsd.h (or):
* s/netbsd.h (A_TEXT_OFFSET):
* s/netbsd.h (NO_MATHERR):
* s/openbsd.h:
* s/sol2.h:
* s/usg5-4-2.h:
* s/usg5-4.h:
* s/usg5-4.h (or):
* s/usg5-4.h (ORDINARY_LINK):
Sync with GNU 23.1.92.
Put back linux.h.
Rename: bsd4-3.h -> bsd-common.h; irix6-0.h -> irix6-5.h.
Delete: template.h (useless).
Delete a whole bunch of obsolete stuff in sol2.h, linux.h,
freebsd.h -- assume anything over 10 years old is sufficiently
obsolete to be deleted.
Remove LIBS_DEBUG, C_DEBUG_SWITCH, C_OPTIMIZE_SWITCH, KERNEL_FILE,
LDAV_SYMBOL, most remaining PTY stuff, remaining TERMINFO/TERMCAP
stuff. Update README appropriately.
Remove stuff in hpux11-shr.h duplicated in hpux11.h.
Remove sco7.h, identical with usg5-4-2.h.
Remove unused POSIX flag, BROKEN_TIOC*, NO_SIOCTL_H.
2010-02-20 Ben Wing <ben@xemacs.org>
* m/arm.h:
* m/hp800.h:
* m/intel386.h:
* m/mips.h:
* m/powerpc.h:
* m/sparc.h:
* m/template.h:
Temporarily ifdef out all defines involving load-average stuff --
using define ENABLE_SM_FILE_DECLS_OF_LOADAVG_STUFF, which is not
defined.
I'm pretty sure getloadavg.c will take care of defining stuff
properly on all systems without the need to duplicate the info
in m/*. --ben
Delete LIBS_TERMCAP; configure auto-handles this.
Delete extra stuff in hp800.h.
Delete C_DEBUG_SWITCH, C_OPTIMIZE_SWITCH, LDAV_SYMBOL; incorporate
some stuff into configure.ac.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Sat, 20 Feb 2010 06:03:00 -0600 |
parents | 42a8626b741e |
children |
line wrap: on
line source
/* * Copyright (c) 2000, Red Hat, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * A copy of the GNU General Public License can be found at * http://www.gnu.org/ * * Written by DJ Delorie <dj@cygnus.com> * */ /* The purpose of this file is to act as a pretty interface to netio.cc. We add a progress dialog and some convenience functions (like collect to string or file */ #include "win32.h" #include "commctrl.h" #include <stdio.h> #include <stdlib.h> #include <errno.h> #include "dialog.h" #include "geturl.h" #include "resource.h" #include "netio.h" #include "msg.h" #include "log.h" static int is_showing = 0; static HWND gw_dialog = 0; static HWND gw_url = 0; static HWND gw_rate = 0; static HWND gw_progress = 0; static HANDLE init_event; static int max_bytes = 0; static BOOL dialog_cmd (HWND h, int id, HWND hwndctl, UINT code) { switch (id) { case IDCANCEL: exit_setup (0); } return FALSE; } static BOOL CALLBACK dialog_proc (HWND h, UINT message, WPARAM wParam, LPARAM lParam) { switch (message) { case WM_INITDIALOG: gw_dialog = h; gw_url = GetDlgItem (h, IDC_DLS_URL); gw_rate = GetDlgItem (h, IDC_DLS_RATE); gw_progress = GetDlgItem (h, IDC_DLS_PROGRESS); SetEvent (init_event); return FALSE; case WM_COMMAND: return HANDLE_WM_COMMAND (h, wParam, lParam, dialog_cmd); } return FALSE; } static DWORD WINAPI dialog (void *) { MSG m; HWND lgw_dialog = CreateDialog (hinstance, MAKEINTRESOURCE (IDD_DLSTATUS), 0, dialog_proc); ShowWindow (lgw_dialog, SW_SHOWNORMAL); UpdateWindow (lgw_dialog); while (GetMessage (&m, 0, 0, 0) > 0) { TranslateMessage (&m); DispatchMessage (&m); } return FALSE; } static DWORD start_tics; static void init_dialog (char *url, int length) { if (gw_dialog == 0) { DWORD tid; HANDLE thread; init_event = CreateEvent (0, 0, 0, 0); thread = CreateThread (0, 0, dialog, 0, 0, &tid); WaitForSingleObject (init_event, 1000); CloseHandle (init_event); SendMessage (gw_progress, PBM_SETRANGE, 0, MAKELPARAM (0, 100)); is_showing = 0; } char *sl=url, *cp; for (cp=url; *cp; cp++) if (*cp == '/' || *cp == '\\' || *cp == ':') sl = cp+1; max_bytes = length; SetWindowText (gw_url, sl); SetWindowText (gw_rate, "Connecting..."); SendMessage (gw_progress, PBM_SETPOS, (WPARAM) 0, 0); ShowWindow (gw_progress, (length > 0) ? SW_SHOW : SW_HIDE); ShowWindow (gw_dialog, SW_SHOWNORMAL); if (!is_showing) { SetForegroundWindow (gw_dialog); is_showing = 1; } start_tics = GetTickCount (); } static void progress (int bytes) { static char buf[100]; int kbps; static DWORD last_tics = 0; DWORD tics = GetTickCount (); if (tics == start_tics) // to prevent division by zero return; if (tics < last_tics + 200) // to prevent flickering updates return; last_tics = tics; kbps = bytes / (tics - start_tics); ShowWindow (gw_progress, (max_bytes > 0) ? SW_SHOW : SW_HIDE); if (max_bytes > 100) { int perc = bytes / (max_bytes / 100); SendMessage (gw_progress, PBM_SETPOS, (WPARAM) perc, 0); sprintf (buf, "%3d %% (%dk/%dk) %d kb/s\n", perc, bytes/1000, max_bytes/1000, kbps); } else sprintf (buf, "%d %d kb/s\n", bytes, kbps); SetWindowText (gw_rate, buf); } struct GUBuf { GUBuf *next; int count; char buf[2000]; }; char * get_url_to_string (char *_url) { log (LOG_BABBLE, "get_url_to_string %s", _url); init_dialog (_url, 0); NetIO *n = NetIO::open (_url); if (!n || !n->ok ()) { delete n; log (LOG_BABBLE, "get_url_to_string failed!"); return 0; } if (n->file_size) max_bytes = n->file_size; GUBuf *bufs = 0; GUBuf **nextp = &bufs; int total_bytes = 1; /* for the NUL */ progress (0); while (1) { GUBuf *b = new GUBuf; *nextp = b; b->next = 0; nextp = &(b->next); b->count = n->read (b->buf, sizeof (b->buf)); if (b->count <= 0) break; total_bytes += b->count; progress (total_bytes); } char *rv = (char *) malloc (total_bytes); char *rvp = rv; while (bufs && bufs->count > 0) { GUBuf *tmp = bufs->next; memcpy (rvp, bufs->buf, bufs->count); rvp += bufs->count; delete bufs; bufs = tmp; } *rvp = 0; if (n) delete n; return rv; } int get_url_to_file (char *_url, char *_filename, int expected_length) { log (LOG_BABBLE, "get_url_to_file %s %s", _url, _filename); init_dialog (_url, expected_length); remove (_filename); /* but ignore errors */ NetIO *n = NetIO::open (_url); if (!n || !n->ok ()) { delete n; log (LOG_BABBLE, "get_url_to_file failed!"); return 1; } FILE *f = fopen (_filename, "wb"); if (!f) { char *err = strerror (errno); if (!err) err = "(unknown error)"; fatal (IDS_ERR_OPEN_WRITE, _filename, err); } if (n->file_size) max_bytes = n->file_size; int total_bytes = 0; progress (0); while (1) { char buf[8192]; int count; count = n->read (buf, sizeof (buf)); if (count <= 0) break; fwrite (buf, 1, count, f); total_bytes += count; progress (total_bytes); } fclose (f); if (n) delete n; return 0; } void dismiss_url_status_dialog () { ShowWindow (gw_dialog, SW_HIDE); is_showing = 0; }