Mercurial > hg > xemacs-beta
view netinstall/fromcwd.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 | 3078fd1074e8 |
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 handle the case where we're installing from files that already exist in the current directory. If a setup.ini file is present, we set the mirror site to "." and pretend we're installing from the `internet' ;-) else we have to find all the .tar.gz files, deduce their versions, and try to compare versions in the case where the current directory contains multiple versions of any given package. We do *not* try to compare versions with already installed packages; we always choose a package in the current directory over one that's already installed (otherwise, why would you have asked to install it?). Note that we search recursively. */ #include "win32.h" #include <stdio.h> #include <stdlib.h> #include <io.h> #include <ctype.h> #ifndef WIN32_NATIVE #include <unistd.h> #endif #include "ini.h" #include "resource.h" #include "concat.h" #include "state.h" #include "dialog.h" #include "msg.h" #include "find.h" #include "version.h" #include "port.h" static int is_test_version (char *v) { int i; for (i=0; v[i] && isdigit (v[i]); i++) ; return (i >= 6) ? 1 : 0; } char * canonicalize_version (char *v) { static char nv[3][100]; static int idx = 0; char *np, *dp; int i; idx = (idx+1) % 3; np = nv[idx]; while (*v) { if (isdigit (*v)) { for (dp=v; *dp && isdigit (*dp); dp++) ; for (i=dp-v; i<12; i++) *np++ = '0'; while (v < dp) *np++ = *v++; } else *np++ = *v++; } *np++ = 0; return nv[idx]; } static void found_file (char *path, unsigned int fsize) { char base[_MAX_PATH], *ver; int l = strlen (path); if (strcmp (path + l - 7, ".tar.gz") != 0) return; if (strstr (path, "-src.")) return; if (strstr (path, "-patch.")) return; char *sl = strrchr (path, '/'); if (sl) sl ++; else sl = path; strcpy (base, sl); base[strlen (base) - 7] = 0; /* remove .tar.gz */ for (ver=base; *ver; ver++) if ((*ver == '-' || *ver == '_') && isdigit (ver[1])) { *ver++ = 0; break; } Package *p = 0; int i; for (i=0; i<npackages; i++) if (strcmp (package[i].name, base) == 0) { p = package + i; break; } if (p == 0) p = new_package (strdup (base)); int trust = is_test_version (ver) ? TRUST_TEST : TRUST_CURR; if (!*ver) trust = TRUST_PREV; /* See if this version is older than what we have */ if (p->info[trust].version) { char *ov = canonicalize_version (p->info[trust].version); char *nv = canonicalize_version (ver); if (strcmp (ov, nv) > 0) return; } l = strlen (base); if (l >= 5 && strcmp (base + l - 5, "win32") == 0) p->type = TY_NATIVE; if (l >= 8 && strcmp (base + l - 8, "cygwin32") == 0) p->type = TY_CYGWIN; p->info[trust].version = strdup (ver); p->info[trust].install = strdup (path); p->info[trust].install_size = fsize; } void do_fromcwd (HINSTANCE h) { if (_access ("./setup.ini", 0) == 0) { mirror_site = "."; next_dialog = IDD_S_LOAD_INI; return; } next_dialog = IDD_CHOOSE; find (".", found_file); // Now see about source tarballs int i, t; Package *p; char srcpath[_MAX_PATH]; for (i=0; i<npackages; i++) { p = package+i; for (t=TRUST_PREV; t<=TRUST_TEST; t++) if (p->info[t].install) { strcpy (srcpath, p->info[t].install); strcpy (srcpath + strlen (srcpath) - 7, "-src.tar.gz"); msg ("looking for %s", srcpath); WIN32_FIND_DATA wfd; HANDLE h = FindFirstFile (srcpath, &wfd); if (h != INVALID_HANDLE_VALUE) { msg("-- got it"); FindClose (h); p->info[t].source = strdup (srcpath); p->info[t].source_size = wfd.nFileSizeLow; } } } return; }