Mercurial > hg > xemacs-beta
view netinstall/fromcwd.cc @ 5016:2ade80e8c640
enable more warnings and fix them
-------------------- ChangeLog entries follow: --------------------
ChangeLog addition:
2010-02-08 Ben Wing <ben@xemacs.org>
* configure:
* configure.ac (TAB):
Various warnings that used to be present had mistakenly gotten
turned off. Turn them back on.
lwlib/ChangeLog addition:
2010-02-08 Ben Wing <ben@xemacs.org>
* xt-wrappers.h:
* xt-wrappers.h (Xt_SET_VALUE):
* xt-wrappers.h (Xt_GET_VALUE):
Rename var to avoid shadowing problems.
src/ChangeLog addition:
2010-02-08 Ben Wing <ben@xemacs.org>
* alloc.c:
Add prototypes for debugging functions.
* alloc.c (compact_string_chars): Make static.
* console-x.c (x_initially_selected_for_input):
* console-x.h:
* console-x.h (X_ERROR_OCCURRED):
Delete x_has_keysym() prototype from console-x.c, move to console-x.h.
* eval.c (multiple_value_call):
Real bug: Fix shadowing local vars.
* event-unixoid.c (read_event_from_tty_or_stream_desc):
* event-unixoid.c (signal_fake_event):
* lread.c (check_if_suppressed):
* strftime.c (strftime):
Fix stupid global shadowing warnings.
* event-unixoid.c (signal_fake_event):
* event-unixoid.c (drain_signal_event_pipe):
Use Rawbyte, not char.
* frame.h: Remove old prototype.
* gc.c:
* gc.c (show_gc_cursor_and_message):
* gc.c (remove_gc_cursor_and_message):
* gc.c (gc_prepare):
* gc.c (gc_finish_mark):
* gc.c (gc_finalize):
* gc.c (gc_sweep):
* gc.c (gc_finish):
* gc.c (gc_suspend_mark_phase):
* gc.c (gc_resume_mark_phase):
* gc.c (gc_mark):
* gc.c (gc_resume_mark):
Make fns static.
* glyphs-eimage.c (gif_decode_error_string):
Fix non-prototype.
* lisp.h:
Hack around global shadowing warnings involving `index'.
* intl-win32.c (wcsncpy):
* number-gmp.c (bigfloat_to_string):
* objects-msw.c (mswindows_font_spec_matches_charset_stage_2):
* specifier.c (call_charset_predicate):
* specifier.c (DEFINE_SPECIFIER_TAG_FROB):
Declarations cannot follow statements in standard C.
* search.c (search_buffer): Fix local shadowing warnings.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Mon, 08 Feb 2010 21:28:57 -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; }