← Back to branch summary

~ubuntu-branches/ubuntu/lucid/php5/lucid

« back to all changes in this revision

Viewing changes to ext/standard/file.c

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2010-03-16 09:09:50 UTC
  • mfrom: (1.1.18 upstream) (0.3.10 sid)
  • Revision ID: james.westby@ubuntu.com-20100316090950-e36m0pzranoixifd
Tags: 5.3.2-1ubuntu1
* Merge from debian unstable: 
  - debian/control:
    * Dropped firebird2.1-dev, libc-client-dev, libmcrypt-dev as it is in universe.
    * Dropped libmysqlclient15-dev, build against mysql 5.1.
    * Dropped libcurl-dev not in the archive.
    * Suggest php5-suhosin rather than recommends.
    * Dropped php5-imap, php5-interbase, php5-mcrypt since we have versions already in
      universe.
    * Dropped libonig-dev and libqgdbm since its in universe. (will be re-added in lucid+1)
    * Dropped locales-all.
  - modulelist: Drop imap, interbase, and mcrypt.
  - debian/rules:
    * Dropped building of mcrypt, imap, and interbase.
    * Install apport hook for php5.
  - Dropped debian/patches/libedit_is_editline.patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ext/standard/file.c
2
2
   +----------------------------------------------------------------------+
3
3
   | PHP Version 5                                                        |
4
4
   +----------------------------------------------------------------------+
5
 
   | Copyright (c) 1997-2009 The PHP Group                                |
 
5
   | Copyright (c) 1997-2010 The PHP Group                                |
6
6
   +----------------------------------------------------------------------+
7
7
   | This source file is subject to version 3.01 of the PHP license,      |
8
8
   | that is bundled with this package in the file LICENSE, and is        |
21
21
   +----------------------------------------------------------------------+
22
22
*/
23
23
 
24
 
/* $Id: file.c 289422 2009-10-09 14:37:45Z pajoye $ */
 
24
/* $Id: file.c 294896 2010-02-11 18:03:57Z johannes $ */
25
25
 
26
26
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
27
27
 
50
50
# include "win32/param.h"
51
51
# include "win32/winutil.h"
52
52
# include "win32/fnmatch.h"
53
 
#elif defined(NETWARE)
54
 
# include <sys/param.h>
55
 
# include <sys/select.h>
56
 
# ifdef USE_WINSOCK
57
 
#  include <novsock2.h>
58
 
# else
59
 
#  include <sys/socket.h>
60
 
#  include <netinet/in.h>
61
 
#  include <netdb.h>
62
 
# endif
63
53
#else
64
54
# if HAVE_SYS_PARAM_H
65
55
#  include <sys/param.h>
846
836
                return;
847
837
        }
848
838
 
849
 
        if (PG(safe_mode) &&(!php_checkuid(dir, NULL, CHECKUID_ALLOW_ONLY_DIR))) {
 
839
        if (PG(safe_mode) &&(!php_checkuid(dir, NULL, CHECKUID_CHECK_FILE_AND_DIR))) {
850
840
                RETURN_FALSE;
851
841
        }
852
842
 
1636
1626
        MAKE_LONG_ZVAL_INCREF(stat_rdev, -1);
1637
1627
#endif
1638
1628
        MAKE_LONG_ZVAL_INCREF(stat_size, stat_ssb.sb.st_size);
1639
 
#ifdef NETWARE
1640
 
        MAKE_LONG_ZVAL_INCREF(stat_atime, stat_ssb.sb.st_atime.tv_sec);
1641
 
        MAKE_LONG_ZVAL_INCREF(stat_mtime, stat_ssb.sb.st_mtime.tv_sec);
1642
 
        MAKE_LONG_ZVAL_INCREF(stat_ctime, stat_ssb.sb.st_ctime.tv_sec);
1643
 
#else
1644
1629
        MAKE_LONG_ZVAL_INCREF(stat_atime, stat_ssb.sb.st_atime);
1645
1630
        MAKE_LONG_ZVAL_INCREF(stat_mtime, stat_ssb.sb.st_mtime);
1646
1631
        MAKE_LONG_ZVAL_INCREF(stat_ctime, stat_ssb.sb.st_ctime);
1647
 
#endif
1648
 
 
1649
1632
#ifdef HAVE_ST_BLKSIZE
1650
1633
        MAKE_LONG_ZVAL_INCREF(stat_blksize, stat_ssb.sb.st_blksize);
1651
1634
#else