view netinstall/concat.cc @ 4897:91a023144e72

fix longstanding search bug involving searching for Control-1 chars -------------------- ChangeLog entries follow: -------------------- src/ChangeLog addition: 2010-01-29 Ben Wing <ben@xemacs.org> * search.c (boyer_moore): Fix longstanding bug involving searching for Control-1 chars; code was trying to directly extract the last byte in the textual representation of a char from an Ichar (and doing it in a buggy fashion) rather than just converting the Ichar to text and looking at the last byte. tests/ChangeLog addition: 2010-01-29 Ben Wing <ben@xemacs.org> * automated/search-tests.el: New file. * automated/search-tests.el: * automated/case-tests.el: * automated/case-tests.el (pristine-case-table): Removed. * automated/case-tests.el (uni-mappings): * automated/lisp-tests.el: * automated/regexp-tests.el: Extract some search-related code from case-tests and regexp-tests and move to search-tests. Move some regexp-related code from lisp-tests to regexp-tests. Write a comment trying to express the proper division of labor between case-tests, search-tests and regexp-tests. Add a new test for the Control-1 search bug. Fix a buggy test in the Unicode torture-test section of case-tests.el.
author Ben Wing <ben@xemacs.org>
date Fri, 29 Jan 2010 20:57:42 -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>
 *
 */

/* See concat.h.  Note that we canonicalize the result, this avoids
   multiple slashes being interpreted as UNCs. */

#include "win32.h"
#include <stdarg.h>
#include <stdlib.h>
#include <string.h>

char * CDECL
concat (char *s, ...)
{
  int len;
  char *rv, *arg;
  va_list v;

  if (!s)
    return 0;

  len = strlen (s);

  va_start (v, s);
  while (1)
    {
      arg = va_arg (v, char *);
      if (arg == 0)
	break;
      len += strlen (arg);
    }
  va_end (v);

  rv = (char *) malloc (len+1);
  strcpy (rv, s);
  va_start (v, s);
  while (1)
  {
    arg = va_arg (v, char *);
    if (arg == 0)
      break;
    strcat (rv, arg);
  }
  va_end (v);

  /* concat is only used for urls and files, so we can safely
     canonicalize the results */
  char *d;
  for (s=rv; *s; s++)
    if (*s == '\\')
      *s = '/';
  for (s=d=rv; *s; s++)
    {
      *d++ = *s;
      /* special case for URLs */
      if (*s == ':' && s[1] == '/' && s[2] == '/' && s > rv+1)
	{
	  *d++ = *++s;
	  *d++ = *++s;
	}
      else if (*s == '/')
	while (s[1] == '/')
	  s++;
    }
  *d = 0;

  return rv;
}

char *
backslash (char *s)
{
  for (char *t = s; *t; t++)
    if (*t == '/')
      *t = '\\';
  return s;
}