From 72e7f011b29998d8a3e15eb5b381ef962af5fe5b Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Fri, 5 Apr 2019 10:30:58 +0300
Subject: Upgrade to 8.0.15

---
 mysql/mysys/mf_format.c | 147 ------------------------------------------------
 1 file changed, 147 deletions(-)
 delete mode 100644 mysql/mysys/mf_format.c

(limited to 'mysql/mysys/mf_format.c')

diff --git a/mysql/mysys/mf_format.c b/mysql/mysys/mf_format.c
deleted file mode 100644
index e319615..0000000
--- a/mysql/mysys/mf_format.c
+++ /dev/null
@@ -1,147 +0,0 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
-
-   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; version 2 of the License.
-
-   This program 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 General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
-
-#include "mysys_priv.h"
-#include "my_sys.h"
-#include <m_string.h>
-
-/*
-  Formats a filename with possible replace of directory of extension
-  Function can handle the case where 'to' == 'name'
-  For a description of the flag values, consult my_sys.h
-  The arguments should be in unix format.
-*/
-
-char * fn_format(char * to, const char *name, const char *dir,
-		    const char *extension, uint flag)
-{
-  char dev[FN_REFLEN], buff[FN_REFLEN], *pos, *startpos;
-  const char *ext;
-  size_t length;
-  size_t dev_length;
-  DBUG_ENTER("fn_format");
-  DBUG_ASSERT(name != NULL);
-  DBUG_ASSERT(extension != NULL);
-  DBUG_PRINT("enter",("name: %s  dir: %s  extension: %s  flag: %d",
-		       name,dir,extension,flag));
-
-  /* Copy and skip directory */
-  name+=(length=dirname_part(dev, (startpos=(char *) name), &dev_length));
-  if (length == 0 || (flag & MY_REPLACE_DIR))
-  {
-    DBUG_ASSERT(dir != NULL);
-    /* Use given directory */
-    convert_dirname(dev,dir,NullS);		/* Fix to this OS */
-  }
-  else if ((flag & MY_RELATIVE_PATH) && !test_if_hard_path(dev))
-  {
-    DBUG_ASSERT(dir != NULL);
-    /* Put 'dir' before the given path */
-    strmake(buff,dev,sizeof(buff)-1);
-    pos=convert_dirname(dev,dir,NullS);
-    strmake(pos,buff,sizeof(buff)-1- (int) (pos-dev));
-  }
-
-  if (flag & MY_PACK_FILENAME)
-    pack_dirname(dev,dev);			/* Put in ./.. and ~/.. */
-  if (flag & MY_UNPACK_FILENAME)
-    (void) unpack_dirname(dev,dev);		/* Replace ~/.. with dir */
-
-  if (!(flag & MY_APPEND_EXT) &&
-      (pos= (char*) strchr(name,FN_EXTCHAR)) != NullS)
-  {
-    if ((flag & MY_REPLACE_EXT) == 0)		/* If we should keep old ext */
-    {
-      length=strlength(name);			/* Use old extension */
-      ext = "";
-    }
-    else
-    {
-      length= (size_t) (pos-(char*) name);	/* Change extension */
-      ext= extension;
-    }
-  }
-  else
-  {
-    length=strlength(name);			/* No ext, use the now one */
-    ext=extension;
-  }
-
-  if (strlen(dev)+length+strlen(ext) >= FN_REFLEN || length >= FN_LEN )
-  {
-    /* To long path, return original or NULL */
-    size_t tmp_length;
-    if (flag & MY_SAFE_PATH)
-      DBUG_RETURN(NullS);
-    tmp_length= strlength(startpos);
-    DBUG_PRINT("error",("dev: '%s'  ext: '%s'  length: %u",dev,ext,
-                        (uint) length));
-    (void) strmake(to, startpos, MY_MIN(tmp_length, FN_REFLEN-1));
-  }
-  else
-  {
-    if (to == startpos)
-    {
-      memmove(buff, name, length);              /* Save name for last copy */
-      name=buff;
-    }
-    pos=strmake(my_stpcpy(to,dev),name,length);
-    (void) my_stpcpy(pos,ext);			/* Don't convert extension */
-  }
-  /*
-    If MY_RETURN_REAL_PATH and MY_RESOLVE_SYMLINK is given, only do
-    realpath if the file is a symbolic link
-  */
-  if (flag & MY_RETURN_REAL_PATH)
-    (void) my_realpath(to, to, MYF(flag & MY_RESOLVE_SYMLINKS ?
-				   MY_RESOLVE_LINK: 0));
-  else if (flag & MY_RESOLVE_SYMLINKS)
-  {
-    my_stpcpy(buff,to);
-    (void) my_readlink(to, buff, MYF(0));
-  }
-  DBUG_RETURN(to);
-} /* fn_format */
-
-
-/*
-  strlength(const string str)
-  Return length of string with end-space:s not counted.
-*/
-
-size_t strlength(const char *str)
-{
-  const char * pos;
-  const char * found;
-  DBUG_ENTER("strlength");
-
-  pos= found= str;
-
-  while (*pos)
-  {
-    if (*pos != ' ')
-    {
-      while (*++pos && *pos != ' ') {};
-      if (!*pos)
-      {
-	found=pos;			/* String ends here */
-	break;
-      }
-    }
-    found=pos;
-    while (*++pos == ' ') {};
-  }
-  DBUG_RETURN((size_t) (found - str));
-} /* strlength */
-- 
cgit v1.1