mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +01:00
63b7b45ff7
Error on full disk on repair. SIGHUP signal handling. Update with keys on timestamp Portability fixes Docs/manual.texi: Added documentation about automatic repair of MyISAM tables client/mysql.cc: Remove usage of tempnam. include/my_sys.h: Added create_temp_file include/myisam.h: Fix for disk full on repair myisam/mi_check.c: Fix for disk full on repair myisam/sort.c: Fix for disk full on repair & removed usage of tempnam() mysys/mf_cache.c: Remove usage of tempnam() mysys/mf_dirname.c: Changed convert_dirname to return end 0 mysys/my_fopen.c: Security fixes mysys/my_tempnam.c: remove blanks readline/bind.c: Portability fixes readline/complete.c: Portability fixes readline/histexpand.c: Portability fixes readline/input.c: Portability fixes readline/search.c: Portability fixes readline/shell.c: Portability fixes readline/terminal.c: Portability fixes readline/tilde.c: Portability fixes readline/undo.c: Portability fixes regex/cname.h: Portability fixes regex/debug.c: Portability fixes regex/main.c: Portability fixes regex/regcomp.c: Portability fixes regex/regerror.c: Portability fixes sql/filesort.cc: Remove dummy code sql/ha_myisam.cc: Automatic repair of MyISAM tables sql/ha_myisam.h: Automatic repair of MyISAM tables sql/handler.cc: Automatic repair of MyISAM tables sql/handler.h: Automatic repair of MyISAM tables sql/key.cc: Fix for UPDATE with key on timestamp column sql/mysql_priv.h: Automatic repair of MyISAM tables sql/mysqld.cc: Automatic repair of MyISAM tables & signal SIGHUP handling sql/sql_base.cc: Automatic repair of MyISAM tables sql/sql_class.cc: Automatic repair of MyISAM tables sql/sql_class.h: Fix for insert with reference to columns sql/sql_insert.cc: Fix for insert with reference to columns sql/table.cc: Automatic repair of MyISAM tables BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
106 lines
2.7 KiB
C
106 lines
2.7 KiB
C
/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
|
|
|
|
This library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Library General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2 of the License, or (at your option) any later version.
|
|
|
|
This library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with this library; if not, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
|
|
MA 02111-1307, USA */
|
|
|
|
#include "mysys_priv.h"
|
|
#include <m_string.h>
|
|
|
|
/* Functions definied in this file */
|
|
|
|
uint dirname_length(const char *name)
|
|
{
|
|
register my_string pos,gpos;
|
|
#ifdef FN_DEVCHAR
|
|
if ((pos=strrchr(name,FN_DEVCHAR)) == 0)
|
|
#endif
|
|
pos=(char*) name-1;
|
|
|
|
gpos= pos++;
|
|
for ( ; *pos ; pos++) /* Find last FN_LIBCHAR */
|
|
if (*pos == FN_LIBCHAR || *pos == '/'
|
|
#ifdef FN_C_AFTER_DIR
|
|
|| *pos == FN_C_AFTER_DIR || *pos == FN_C_AFTER_DIR_2
|
|
#endif
|
|
)
|
|
gpos=pos;
|
|
return ((uint) (uint) (gpos+1-(char*) name));
|
|
}
|
|
|
|
|
|
/* Gives directory part of filename. Directory ends with '/' */
|
|
/* Returns length of directory part */
|
|
|
|
uint dirname_part(my_string to, const char *name)
|
|
{
|
|
uint length;
|
|
DBUG_ENTER("dirname_part");
|
|
DBUG_PRINT("enter",("'%s'",name));
|
|
|
|
length=dirname_length(name);
|
|
(void) strmake(to,(char*) name,min(length,FN_REFLEN-2));
|
|
convert_dirname(to); /* Convert chars */
|
|
DBUG_RETURN(length);
|
|
} /* dirname */
|
|
|
|
|
|
/* convert dirname to use under this system */
|
|
/* If MSDOS converts '/' to '\' */
|
|
/* If VMS converts '<' to '[' and '>' to ']' */
|
|
/* Adds a '/' to end if there isn't one and the last isn't a dev_char */
|
|
/* ARGSUSED */
|
|
|
|
#ifndef FN_DEVCHAR
|
|
#define FN_DEVCHAR '\0' /* For easier code */
|
|
#endif
|
|
|
|
char *convert_dirname(my_string to)
|
|
{
|
|
reg1 char *pos;
|
|
#ifdef FN_UPPER_CASE
|
|
caseup_str(to);
|
|
#endif
|
|
#ifdef FN_LOWER_CASE
|
|
casedn_str(to);
|
|
#endif
|
|
#if FN_LIBCHAR != '/'
|
|
{
|
|
pos=to-1; /* Change from '/' */
|
|
while ((pos=strchr(pos+1,'/')) != 0)
|
|
*pos=FN_LIBCHAR;
|
|
}
|
|
#endif
|
|
#ifdef FN_C_BEFORE_DIR_2
|
|
{
|
|
for (pos=to ; *pos ; pos++)
|
|
{
|
|
if (*pos == FN_C_BEFORE_DIR_2)
|
|
*pos=FN_C_BEFORE_DIR;
|
|
if (*pos == FN_C_AFTER_DIR_2)
|
|
*pos=FN_C_AFTER_DIR;
|
|
}
|
|
}
|
|
#else
|
|
{ /* Append FN_LIBCHAR if not there */
|
|
pos=strend(to);
|
|
if (pos != to && (pos[-1] != FN_LIBCHAR && pos[-1] != FN_DEVCHAR))
|
|
{
|
|
*pos++=FN_LIBCHAR;
|
|
*pos=0;
|
|
}
|
|
}
|
|
#endif
|
|
return pos; /* Pointer to end of dir */
|
|
} /* convert_dirname */
|