Change directory name from core to main.

5 files changed, 81 insertions, 81 deletions

diff --git a/Makefile.in b/Makefile.in
index 70ffccfd3a..81d2b7a600 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,6 +1,6 @@
 
 ZEND_DIR = $(srcdir)/Zend
-SUBDIRS = Zend core ext sapi $(TSRM_DIR) $(REGEX_DIR) . $(PEAR_DIR)
+SUBDIRS = Zend main ext sapi $(TSRM_DIR) $(REGEX_DIR) . $(PEAR_DIR)
 
 LTLIBRARY_NAME = libphp4.la
 LTLIBRARY_SOURCES = stub.c
@@ -8,7 +8,7 @@ LTLIBRARY_SOURCES = stub.c
 LTLIBRARY_DEPENDENCIES = \
 		Zend/libZend.la \
 		sapi/$(PHP_SAPI)/libsapi.la \
-		core/libcore.la \
+		main/libmain.la \
 		$(REGEX_LIB) \
 		$(EXT_LTLIBS) \
 		$(TSRM_LIB)
diff --git a/configure.in b/configure.in
index 71a40f12bf..05b4331088 100644
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ divert(1)
 
 AC_INIT(README.CVS-RULES)
 
-PHP_FAST_OUTPUT(sapi/Makefile ext/Makefile Makefile pear/Makefile core/Makefile)
+PHP_FAST_OUTPUT(sapi/Makefile ext/Makefile Makefile pear/Makefile main/Makefile)
 
 if test "$with_shared_apache" != "no" && test -n "$with_shared_apache" ; then
   AC_MSG_ERROR(--with-shared-apache is not supported. Please refer to the documentation for using APXS)
@@ -629,7 +629,7 @@ else
 fi
 
 if test "$abs_srcdir" != "$abs_builddir"; then
-  INCLUDES="$INCLUDES -I\$(top_srcdir)/core -I\$(top_srcdir)/Zend"
+  INCLUDES="$INCLUDES -I\$(top_srcdir)/main -I\$(top_srcdir)/Zend"
   if test "$PHP_THREAD_SAFETY" = "yes"; then
     INCLUDES="$INCLUDES -I\$(top_srcdir)/TSRM"
   fi
@@ -827,15 +827,15 @@ FEO
 if true; then
   # Hacking while airborne considered harmful.
   #
-  echo "creating core/internal_functions.c"
+  echo "creating main/internal_functions.c"
   extensions=\`grep '^s.@EXT_STATIC@' \$0|sed -e 's/^.*@% *//' -e 's/%.*$//'\`
-  mv -f core/internal_functions.c core/internal_functions.c.old 2>/dev/null
-  sh $srcdir/genif.sh $srcdir/core/internal_functions.c.in $srcdir "$EXTRA_MODULE_PTRS" \$extensions > core/internal_functions.c
-  if cmp core/internal_functions.c.old core/internal_functions.c > /dev/null 2>&1; then
-      echo "core/internal_functions.c is unchanged"
-      mv core/internal_functions.c.old core/internal_functions.c
+  mv -f main/internal_functions.c main/internal_functions.c.old 2>/dev/null
+  sh $srcdir/genif.sh $srcdir/main/internal_functions.c.in $srcdir "$EXTRA_MODULE_PTRS" \$extensions > main/internal_functions.c
+  if cmp main/internal_functions.c.old main/internal_functions.c > /dev/null 2>&1; then
+      echo "main/internal_functions.c is unchanged"
+      mv main/internal_functions.c.old main/internal_functions.c
   else
-      rm -f core/internal_functions.c.old
+      rm -f main/internal_functions.c.old
   fi
 
   if test -n "$PHP_APXS_BROKEN"; then
diff --git a/main/Makefile.in b/main/Makefile.in
index 26e2008149..d334842905 100644
--- a/main/Makefile.in
+++ b/main/Makefile.in
@@ -1,4 +1,4 @@
-LTLIBRARY_NAME = libcore.la
+LTLIBRARY_NAME = libmain.la
 
 LTLIBRARY_SOURCES = \
        main.c internal_functions.c snprintf.c php_sprintf.c \
diff --git a/php4dll.dsp b/php4dll.dsp
index 04ab52cfa0..e3ec2719cb 100644
--- a/php4dll.dsp
+++ b/php4dll.dsp
@@ -140,7 +140,7 @@ SOURCE=".\fopen-wrappers.c"
 # End Source File

 # Begin Source File

 

-SOURCE=.\core\internal_functions_win32.c

+SOURCE=.\main\internal_functions_win32.c

 

 !IF  "$(CFG)" == "php4dll - Win32 Debug"

 

@@ -159,11 +159,11 @@ SOURCE=.\core\internal_functions_win32.c
 # End Source File

 # Begin Source File

 

-SOURCE=.\core\main.c

+SOURCE=.\main\main.c

 # End Source File

 # Begin Source File

 

-SOURCE=.\core\mergesort.c

+SOURCE=.\main\mergesort.c

 # End Source File

 # Begin Source File

 

@@ -171,27 +171,27 @@ SOURCE=.\ext\standard\output.c
 # End Source File

 # Begin Source File

 

-SOURCE=.\core\php_content_types.c

+SOURCE=.\main\php_content_types.c

 # End Source File

 # Begin Source File

 

-SOURCE=.\core\php_ini.c

+SOURCE=.\main\php_ini.c

 # End Source File

 # Begin Source File

 

-SOURCE=.\core\php_realpath.c

+SOURCE=.\main\php_realpath.c

 # End Source File

 # Begin Source File

 

-SOURCE=.\core\php_ticks.c

+SOURCE=.\main\php_ticks.c

 # End Source File

 # Begin Source File

 

-SOURCE=.\core\php_variables.c

+SOURCE=.\main\php_variables.c

 # End Source File

 # Begin Source File

 

-SOURCE=.\core\php_virtual_cwd.c

+SOURCE=.\main\php_virtual_cwd.c

 # End Source File

 # Begin Source File

 

@@ -199,27 +199,27 @@ SOURCE=.\ext\standard\quot_print.c
 # End Source File

 # Begin Source File

 

-SOURCE=.\core\reentrancy.c

+SOURCE=.\main\reentrancy.c

 # End Source File

 # Begin Source File

 

-SOURCE=.\core\rfc1867.c

+SOURCE=.\main\rfc1867.c

 # End Source File

 # Begin Source File

 

-SOURCE=.\core\safe_mode.c

+SOURCE=.\main\safe_mode.c

 # End Source File

 # Begin Source File

 

-SOURCE=.\core\SAPI.c

+SOURCE=.\main\SAPI.c

 # End Source File

 # Begin Source File

 

-SOURCE=.\core\strlcat.c

+SOURCE=.\main\strlcat.c

 # End Source File

 # Begin Source File

 

-SOURCE=.\core\strlcpy.c

+SOURCE=.\main\strlcpy.c

 # End Source File

 # End Group

 # Begin Group "Header Files"

@@ -227,7 +227,7 @@ SOURCE=.\core\strlcpy.c
 # PROP Default_Filter ""

 # Begin Source File

 

-SOURCE=.\core\config.w32.h

+SOURCE=.\main\config.w32.h

 # End Source File

 # Begin Source File

 

@@ -243,59 +243,59 @@ SOURCE=.\ext\standard\cyr_convert.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\core\getopt.h

+SOURCE=.\main\getopt.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\core\internal_functions_registry.h

+SOURCE=.\main\internal_functions_registry.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\core\logos.h

+SOURCE=.\main\logos.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\core\main.h

+SOURCE=.\main\main.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\core\output.h

+SOURCE=.\main\output.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\core\php.h

+SOURCE=.\main\php.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\core\php3_compat.h

+SOURCE=.\main\php3_compat.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\core\php_content_types.h

+SOURCE=.\main\php_content_types.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\core\php_globals.h

+SOURCE=.\main\php_globals.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\core\php_ini.h

+SOURCE=.\main\php_ini.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\core\php_realpath.h

+SOURCE=.\main\php_realpath.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\core\php_ticks.h

+SOURCE=.\main\php_ticks.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\core\php_variables.h

+SOURCE=.\main\php_variables.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\core\php_virtual_cwd.h

+SOURCE=.\main\php_virtual_cwd.h

 # End Source File

 # Begin Source File

 

@@ -303,19 +303,19 @@ SOURCE=.\ext\standard\quot_print.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\core\rfc1867.h

+SOURCE=.\main\rfc1867.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\core\safe_mode.h

+SOURCE=.\main\safe_mode.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\core\SAPI.h

+SOURCE=.\main\SAPI.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\core\win95nt.h

+SOURCE=.\main\win95nt.h

 # End Source File

 # End Group

 # End Group

diff --git a/php4dllts.dsp b/php4dllts.dsp
index f4361ac891..9790a18af5 100644
--- a/php4dllts.dsp
+++ b/php4dllts.dsp
@@ -140,40 +140,40 @@ SOURCE=".\fopen-wrappers.c"
 # End Source File

 # Begin Source File

 

-SOURCE=.\core\internal_functions_win32.c

+SOURCE=.\main\internal_functions_win32.c

 # ADD CPP /I "ext\xml\expat\xmltok" /I "ext\xml\expat\xmlparse"

 # End Source File

 # Begin Source File

 

-SOURCE=.\core\main.c

+SOURCE=.\main\main.c

 # End Source File

 # Begin Source File

 

-SOURCE=.\core\mergesort.c

+SOURCE=.\main\mergesort.c

 # End Source File

 # Begin Source File

 

-SOURCE=.\core\php_content_types.c

+SOURCE=.\main\php_content_types.c

 # End Source File

 # Begin Source File

 

-SOURCE=.\core\php_ini.c

+SOURCE=.\main\php_ini.c

 # End Source File

 # Begin Source File

 

-SOURCE=.\core\php_realpath.c

+SOURCE=.\main\php_realpath.c

 # End Source File

 # Begin Source File

 

-SOURCE=.\core\php_ticks.c

+SOURCE=.\main\php_ticks.c

 # End Source File

 # Begin Source File

 

-SOURCE=.\core\php_variables.c

+SOURCE=.\main\php_variables.c

 # End Source File

 # Begin Source File

 

-SOURCE=.\core\php_virtual_cwd.c

+SOURCE=.\main\php_virtual_cwd.c

 # End Source File

 # Begin Source File

 

@@ -181,27 +181,27 @@ SOURCE=.\ext\standard\quot_print.c
 # End Source File

 # Begin Source File

 

-SOURCE=.\core\reentrancy.c

+SOURCE=.\main\reentrancy.c

 # End Source File

 # Begin Source File

 

-SOURCE=.\core\rfc1867.c

+SOURCE=.\main\rfc1867.c

 # End Source File

 # Begin Source File

 

-SOURCE=.\core\safe_mode.c

+SOURCE=.\main\safe_mode.c

 # End Source File

 # Begin Source File

 

-SOURCE=.\core\SAPI.c

+SOURCE=.\main\SAPI.c

 # End Source File

 # Begin Source File

 

-SOURCE=.\core\strlcat.c

+SOURCE=.\main\strlcat.c

 # End Source File

 # Begin Source File

 

-SOURCE=.\core\strlcpy.c

+SOURCE=.\main\strlcpy.c

 # End Source File

 # End Group

 # Begin Group "Header Files"

@@ -209,7 +209,7 @@ SOURCE=.\core\strlcpy.c
 # PROP Default_Filter ""

 # Begin Source File

 

-SOURCE=.\core\config.w32.h

+SOURCE=.\main\config.w32.h

 # End Source File

 # Begin Source File

 

@@ -225,63 +225,63 @@ SOURCE=.\ext\standard\cyr_convert.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\core\getopt.h

+SOURCE=.\main\getopt.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\core\internal_functions_registry.h

+SOURCE=.\main\internal_functions_registry.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\core\logos.h

+SOURCE=.\main\logos.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\core\main.h

+SOURCE=.\main\main.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\core\output.h

+SOURCE=.\main\output.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\core\php.h

+SOURCE=.\main\php.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\core\php3_compat.h

+SOURCE=.\main\php3_compat.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\core\php_compat.h

+SOURCE=.\main\php_compat.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\core\php_content_types.h

+SOURCE=.\main\php_content_types.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\core\php_globals.h

+SOURCE=.\main\php_globals.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\core\php_ini.h

+SOURCE=.\main\php_ini.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\core\php_realpath.h

+SOURCE=.\main\php_realpath.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\core\php_regex.h

+SOURCE=.\main\php_regex.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\core\php_variables.h

+SOURCE=.\main\php_variables.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\core\php_virtual_cwd.h

+SOURCE=.\main\php_virtual_cwd.h

 # End Source File

 # Begin Source File

 

@@ -289,19 +289,19 @@ SOURCE=.\ext\standard\quot_print.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\core\rfc1867.h

+SOURCE=.\main\rfc1867.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\core\safe_mode.h

+SOURCE=.\main\safe_mode.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\core\SAPI.h

+SOURCE=.\main\SAPI.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\core\win95nt.h

+SOURCE=.\main\win95nt.h

 # End Source File

 # End Group

 # End Group