| Comment: | Merge trunk into branch "1.0" |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | 1.0 |
| Files: | files | file ages | folders |
| SHA3-256: |
98f0907d36e6738cb7d7280a27b63159 |
| User & Date: | js on 2020-07-06 23:42:22 |
| Other Links: | branch diff | manifest | tags |
|
2020-10-04
| ||
| 14:39 | Merge trunk into 1.0 branch (check-in: a9f08709d2 user: js tags: 1.0) | |
|
2020-07-06
| ||
| 23:42 | Merge trunk into branch "1.0" (check-in: 98f0907d36 user: js tags: 1.0) | |
| 19:10 | Update PLATFORMS.md (check-in: f87321ad31 user: js tags: trunk) | |
|
2020-05-31
| ||
| 16:19 | Merge trunk into 1.0 branch (check-in: 8d693c2d5f user: js tags: 1.0) | |
Added .cirrus.yml version [6338675a88].
> > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 |
task:
name: FreeBSD 12.1
freebsd_instance:
image_family: freebsd-12-1
install_script:
pkg install -y autoconf automake
shared_script:
- ./autogen.sh
- ./configure
- make -j4 install
static_script:
- ./autogen.sh
- ./configure --disable-shared
- make -j4 install
shared_seluid24_script:
- ./autogen.sh
- ./configure --enable-seluid24
- make -j4 install
static_seluid24_script:
- ./autogen.sh
- ./configure --disable-shared --enable-seluid24
- make -j4 install
|
Modified .fossil-settings/clean-glob from [595fdf02ee] to [3301e296e0].
| ︙ | ︙ | |||
17 18 19 20 21 22 23 | boot.dol buildsys.mk config.h config.h.in config.log config.status configure | < > | 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 | boot.dol buildsys.mk config.h config.h.in config.log config.status configure docs extra.mk generators/gen_tables src/Info.plist src/bridge/Info.plist src/objfw-defs.h src/runtime/amiga-library-functable.inc src/runtime/inline.h tests/DerivedData tests/EBOOT.PBP tests/Info.plist tests/PARAM.SFO tests/objc_sync/objc_sync tests/plugin/Info.plist tests/terminal/terminal_tests tests/tests |
| ︙ | ︙ |
Modified .fossil-settings/ignore-glob from [07279cddfa] to [db5d43464b].
| ︙ | ︙ | |||
19 20 21 22 23 24 25 | boot.dol buildsys.mk config.h config.h.in config.log config.status configure | < > | 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 | boot.dol buildsys.mk config.h config.h.in config.log config.status configure docs extra.mk generators/gen_tables src/Info.plist src/bridge/Info.plist src/objfw-defs.h src/runtime/amiga-library-functable.inc src/runtime/inline.h tests/DerivedData tests/EBOOT.PBP tests/Info.plist tests/PARAM.SFO tests/iOS.xcodeproj/*.pbxuser tests/iOS.xcodeproj/project.xcworkspace tests/iOS.xcodeproj/xcuserdata tests/objc_sync/objc_sync |
| ︙ | ︙ |
Modified .gitignore from [3ed518618d] to [a12dbef95c].
| ︙ | ︙ | |||
19 20 21 22 23 24 25 | boot.dol buildsys.mk config.h config.h.in config.log config.status configure | < > | 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 | boot.dol buildsys.mk config.h config.h.in config.log config.status configure docs extra.mk generators/gen_tables src/Info.plist src/bridge/Info.plist src/objfw-defs.h src/runtime/amiga-library-functable.inc src/runtime/inline.h tests/DerivedData tests/EBOOT.PBP tests/Info.plist tests/PARAM.SFO tests/iOS.xcodeproj/*.pbxuser tests/iOS.xcodeproj/project.xcworkspace tests/iOS.xcodeproj/xcuserdata tests/objc_sync/objc_sync |
| ︙ | ︙ |
Modified .travis.yml from [6d385d9409] to [9cff9210b8].
| ︙ | ︙ | |||
221 222 223 224 225 226 227 |
- os: linux
dist: trusty
env:
- config=amigaos
# Nintendo 3DS
- os: linux
| | | | | 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 |
- os: linux
dist: trusty
env:
- config=amigaos
# Nintendo 3DS
- os: linux
dist: bionic
env:
- config=nintendo_3ds
# Nintendo DS
- os: linux
dist: bionic
env:
- config=nintendo_ds
# Nintendo Wii
- os: linux
dist: bionic
env:
- config=wii
before_install:
- if [ "$TRAVIS_OS_NAME" = "linux" -a -z "$config" ]; then
case "$TRAVIS_CPU_ARCH" in
amd64 | s390x)
|
| ︙ | ︙ | |||
264 265 266 267 268 269 270 |
if grep precise /etc/lsb-release >/dev/null; then
sudo ipx_internal_net add 1234 123456;
fi;
fi
- if [ "$config" = "nintendo_3ds" -o "$config" = "nintendo_ds"
-o "$config" = "wii" ]; then
| > | > | < < < < < < < < | 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 |
if grep precise /etc/lsb-release >/dev/null; then
sudo ipx_internal_net add 1234 123456;
fi;
fi
- if [ "$config" = "nintendo_3ds" -o "$config" = "nintendo_ds"
-o "$config" = "wii" ]; then
deb=devkitpro-pacman.amd64.deb;
wget https://github.com/devkitPro/pacman/releases/download/v1.0.2/$deb;
sudo apt install gdebi;
sudo gdebi -n $deb;
fi
- if [ "$config" = "nintendo_3ds" ]; then
sudo dkp-pacman --noconfirm -Syu 3ds-dev;
fi
- if [ "$config" = "nintendo_ds" ]; then
sudo dkp-pacman --noconfirm -Syu nds-dev;
fi
- if [ "$config" = "wii" ]; then
sudo dkp-pacman --noconfirm -Syu wii-dev;
fi
- if [ "$config" = "amigaos" ]; then
wget -q https://franke.ms/download/amiga-gcc.tgz;
tar -C / -xzf amiga-gcc.tgz;
fi
script:
- build() {
if ! git clean -fxd >/tmp/clean_log 2>&1; then
cat /tmp/clean_log;
exit 1;
fi;
echo ">> Configuring with $@";
./autogen.sh;
|
| ︙ | ︙ |
Modified Makefile from [c0716d54d0] to [4ae8b8a509].
| ︙ | ︙ | |||
8 9 10 11 12 13 14 15 16 | config.h \ config.log \ config.status \ extra.mk include buildsys.mk utils tests: src | > > > > > > | | 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 |
config.h \
config.log \
config.status \
extra.mk
include buildsys.mk
.PHONY: docs tarball
utils tests: src
docs:
rm -fr docs
doxygen >/dev/null
tarball: docs
echo "Generating tarball for version ${PACKAGE_VERSION}..."
rm -fr objfw-${PACKAGE_VERSION} objfw-${PACKAGE_VERSION}.tar \
objfw-${PACKAGE_VERSION}.tar.gz
fossil tarball --name objfw-${PACKAGE_VERSION} current - \
--exclude '.fossil-settings/*,.gitignore,.travis.yml' | \
ofarc -ttgz -xq -
cp configure config.h.in objfw-${PACKAGE_VERSION}/
|
| ︙ | ︙ |
Modified PLATFORMS.md from [98e6767a77] to [b932fb0b9a].
| ︙ | ︙ | |||
75 76 77 78 79 80 81 | * Compilers: Clang * Runtimes: Apple Linux ----- | | | > | | | | | > | 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 |
* Compilers: Clang
* Runtimes: Apple
Linux
-----
* Architectures: Alpha, ARMv6, ARMv7, ARM64, Itanium, m68k, MIPS (O32),
MIPS64 (N64), RISC-V 64, PowerPC, S390x, SuperH-4, x86,
x86_64
* Compilers: Clang 3.0-10.0, GCC 4.6-10.0
* Runtimes: ObjFW
macOS
-----
* OS Versions: 10.5, 10.7-10.14, Darling
* Architectures: PowerPC, PowerPC64, x86, x86_64
* Compilers: Clang 3.1-10.0, GCC 4.2.1
* Runtimes: Apple, ObjFW
MorphOS
-------
* OS Versions: 3.9-3.11
* Architectures: PowerPC
* Compilers: GCC 5.3.0, GCC 5.4.0
* Runtimes: ObjFW
* Notes: libnix and ixemul are both supported
NetBSD
------
* OS Versions: 5.1-9.0
* Architectures: ARM, ARM (big endian, BE8 mode), MIPS (O32), SPARC, SPARC64,
x86, x86_64
* Compilers: Clang 3.0-3.2, GCC 4.1.3 & 4.5.3
* Runtimes: ObjFW
Nintendo 3DS
------------
|
| ︙ | ︙ | |||
132 133 134 135 136 137 138 | * Limitations: No threads, no sockets * Notes: File support requires an argv-compatible launcher (such as HBMenu) OpenBSD ------- | | | 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 | * Limitations: No threads, no sockets * Notes: File support requires an argv-compatible launcher (such as HBMenu) OpenBSD ------- * OS Versions: 5.2-6.7 * Architectures: MIPS64, PA-RISC, PowerPC, SPARC64, x86_64 * Compilers: GCC 6.3.0, Clang 4.0 * Runtimes: ObjFW PlayStation Portable -------------------- |
| ︙ | ︙ | |||
179 180 181 182 183 184 185 | * Runtimes: ObjFW * Limitations: No threads Windows ------- | | > > | > | 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 |
* Runtimes: ObjFW
* Limitations: No threads
Windows
-------
* OS Versions: 98 SE, NT 4.0, XP (x86), 7 (x64), 8 (x64), 8.1 (x64), 10,
Wine (x86 & x64)
* Architectures: x86, x86_64
* Compilers: GCC 5.3.0 & 6.2.0 from msys2 (x86 & x64),
Clang 3.9.0 from msys2 (x86),
Clang 10.0 from msys2 (x86 & x86_64)
* Runtimes: ObjFW
Others
------
Basically, it should run on any POSIX system to which GCC >= 4.6 or a recent
|
| ︙ | ︙ | |||
209 210 211 212 213 214 215 216 217 218 219 220 221 | for the following platforms (except resolveClassMethod: and resolveInstanceMethod:, which are always available): * ARM (EABI/ELF, Apple/Mach-O) * ARM64 (ARM64/ELF, Apple/Mach-O) * MIPS (O32/ELF, EABI/ELF) * PowerPC (SysV/ELF, EABI/ELF, Apple/Mach-O) * SPARC64 (SysV/ELF) * x86 (SysV/ELF, Apple/Mach-O, Win32/PE) * x86_64 (SysV/ELF, Apple/Mach-O, Mach-O, Win64/PE) Apple/Mach-O means both, the Apple ABI and runtime, while Mach-O means the ObjFW runtime on Mach-O. | > | 214 215 216 217 218 219 220 221 222 223 224 225 226 227 | for the following platforms (except resolveClassMethod: and resolveInstanceMethod:, which are always available): * ARM (EABI/ELF, Apple/Mach-O) * ARM64 (ARM64/ELF, Apple/Mach-O) * MIPS (O32/ELF, EABI/ELF) * PowerPC (SysV/ELF, EABI/ELF, Apple/Mach-O) * SPARC (SysV/ELF) * SPARC64 (SysV/ELF) * x86 (SysV/ELF, Apple/Mach-O, Win32/PE) * x86_64 (SysV/ELF, Apple/Mach-O, Mach-O, Win64/PE) Apple/Mach-O means both, the Apple ABI and runtime, while Mach-O means the ObjFW runtime on Mach-O. |
Modified README.md from [dd3a0fa902] to [d6ae3e7b42].
|
| | | | | | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 |
There are three ways you are probably reading this right now:
* On [ObjFW](https://objfw.nil.im/)'s homepage, via Fossil
* On [GitHub](https://github.com/ObjFW/ObjFW)
* Via an editor or pager, by opening `README.md` from a checkout or tarball
ObjFW is developed using Fossil, so if you are reading this on GitHub or any
other place, you are most likely using a mirror.
<h1 id="table-of-contents">Table of Contents</h1>
* [What is ObjFW?](#what)
* [License](#license)
* [Releases](#releases)
* [Cloning the repository](#cloning)
* [Installation](#installation)
* [macOS and iOS](#macos-and-ios)
* [Building as a framework](#building-framework)
* [Using the macOS or iOS framework in Xcode](#framework-in-xcode)
* [Broken Xcode versions](#broken-xcode-versions)
* [Windows](#windows)
* [Getting MSYS2](#getting-msys2)
* [Updating MSYS2](#updating-msys2)
* [Installing MinGW-w64 using MSYS2](#installing-mingw-w64)
* [Getting, building and installing ObjFW](#steps-windows)
* [Nintendo DS, Nintendo 3DS and Wii](#nintendo)
* [Nintendo DS](#nintendo-ds)
* [Nintendo 3DS](#nintendo-3ds)
* [Wii](#wii)
* [Amiga](#amiga)
* [Writing your first application with ObjFW](#first-app)
* [Documentation](#documentation)
* [Bugs and feature requests](#bugs)
* [Support and community](#support)
* [Commercial use](#commercial-use)
<h1 id="what">What is ObjFW?</h1>
ObjFW is a portable, lightweight framework for the Objective-C language. It
enables you to write an application in Objective-C that will run on any
[platform](PLATFORMS.md) supported by ObjFW without having to worry about
differences between operating systems or various frameworks you would
otherwise need if you want to be portable.
It supports all modern Objective-C features when using Clang, but is also
compatible with GCC ≥ 4.6 to allow maximum portability.
ObjFW is intentionally incompatible with Foundation. This has two reasons:
* GNUstep already provides a reimplementation of Foundation, which is only
compatible to a certain degree. This means that a developer still needs to
care about differences between frameworks if they want to be portable. The
idea behind ObjFW is that a developer does not need to concern themselves
with portablility and making sure their code works with multiple
frameworks: Instead, if it works it ObjFW on one platform, they can
reasonably expect it to also work with ObjFW on another platform. ObjFW
behaving differently on different operating systems (unless inevitable
because it is a platform-specific part, like the Windows Registry) is
considered a bug and will be fixed.
* Foundation predates a lot of modern Objective-C concepts. The most
prominent one is exceptions, which are only used in Foundation as a
replacement for `abort()`. This results in cumbersome error handling,
especially in initializers, which in Foundation only return `nil` on error
with no indication of what went wrong. It also means that the return of
every `init` call needs to be checked against `nil`. But in the wild,
nobody actually checks *each and every* return from `init` against `nil`,
leading to bugs. ObjFW fixes this by making exceptions a first class
citizen.
ObjFW also comes with its own lightweight and extremely fast Objective-C
runtime, which in real world use cases was found to be significantly faster
than both GNU's and Apple's runtime.
<h1 id="license">License</h1>
ObjFW is released under three licenses:
* [QPL](LICENSE.QPL)
* [GPLv2](LICENSE.GPLv2)
* [GPLv3](LICENSE.GPLv3)
The QPL allows you to use ObjFW in any open source project. Because the GPL
does not allow using code under any other license, ObjFW is also available
under the GPLv2 and GPLv3 to allow GPL-licensed projects to use ObjFW.
You can pick under which of those three licenses you want to use ObjFW. If
none of them work for you, contact me and we can find a solution.
<h1 id="releases">Releases</h1>
Releases of ObjFW, as well as changelogs and the accompanying documentation
can be found [here](https://objfw.nil.im/wiki?name=Releases).
<h1 id="cloning">Cloning the repository</h1>
ObjFW is developed in a [Fossil](https://fossil-scm.org) repository, with
automatic incremental exports to Git. This means you can either clone the
Fossil repository or the Git repository - it does not make a huge difference.
The main advantage of cloning the Fossil repository over cloning the Git
repository is that you also get all the tickets, wiki pages, etc.
<h2 id="cloning-fossil">Fossil</h2>
Clone the Fossil repository like this:
$ fossil clone https://objfw.nil.im objfw.fossil
$ mkdir objfw && cd objfw
$ fossil open ../objfw.fossil
You can then use Fossil's web interface to browse the timeline, tickets,
wiki pages, etc.:
$ fossil ui
It's also possible to open the same local repository multiple times, so that
you have multiple working directories all backed by the same local
repository.
<h2 id="cloning-git">Git</h2>
To clone the Git repository, use the following:
$ git clone https://github.com/ObjFW/ObjFW
<h1 id="installation">Installation</h1>
To install ObjFW, just run the following commands:
$ ./configure
$ make
|
| ︙ | ︙ | |||
140 141 142 143 144 145 146 |
$ pacman -S mingw-w64-i686-clang mingw-w64-i686-gcc-objc
For 64 bit binaries:
$ pacman -S mingw-w64-x86_64-clang mingw-w64-x86_64-gcc-objc
There is nothing wrong with installing them both, as MSYS2 has created two
| | | | | 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 |
$ pacman -S mingw-w64-i686-clang mingw-w64-i686-gcc-objc
For 64 bit binaries:
$ pacman -S mingw-w64-x86_64-clang mingw-w64-x86_64-gcc-objc
There is nothing wrong with installing them both, as MSYS2 has created two
entries in your start menu: `MinGW-w64 Win32 Shell` and
`MinGW-w64 Win64 Shell`. So if you want to build for 32 or 64 bit, you just
start the correct shell.
Finally, install a few more things needed to build ObjFW:
$ pacman -S autoconf automake fossil make
<h3 id="steps-windows">Getting, building and installing ObjFW</h3>
|
| ︙ | ︙ | |||
217 218 219 220 221 222 223 224 225 226 |
$ objfw-compile -o MyFirstApp MyFirstApp.m
`objfw-compile` is a tool that allows building applications and libraries
using ObjFW without needing a full-blown build system. If you want to use
your own build system, you can get the necessary flags from `objfw-config`.
<h1 id="bugs">Bugs and feature requests</h1>
| > > > > > > > > > > > > > | > > | > > > > > > > > > > > > > > | 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 |
$ objfw-compile -o MyFirstApp MyFirstApp.m
`objfw-compile` is a tool that allows building applications and libraries
using ObjFW without needing a full-blown build system. If you want to use
your own build system, you can get the necessary flags from `objfw-config`.
<h1 id="documentation">Documentation</h1>
You can find the documentation for released versions of ObjFW
[here](https://objfw.nil.im/docs/).
In order to build the documentation yourself (necessary to have documentation
for trunk / master), you need to have [Doxygen](https://www.doxygen.nl)
installed. Once installed, you can build the documentation from the root
directory of the repository:
$ doxygen >/dev/null
<h1 id="bugs">Bugs and feature requests</h1>
If you find any bugs or have feature requests, please
[file a new bug](https://objfw.nil.im/tktnew) in the
[bug tracker](https://objfw.nil.im/reportlist).
Alternatively, feel free to send a mail to js@nil.im!
<h1 id="support">Support and community</h1>
If you have any questions about ObjFW or would like to talk to other ObjFW
users, the following venues are available:
* The [forum](https://objfw.nil.im/forum)
* A [Matrix](https://matrix.to/#/%23objfw:nil.im) room
* An [IRC channel](irc://chat.freenode.net/#objfw) on Freenode (`#objfw`),
bridged to the Matrix room above
Please don't hesitate to join any or all of those!
<h1 id="commercial-use">Commercial use</h1>
If for whatever reason neither the terms of the QPL nor those of the GPL work
for you, a proprietary license for ObjFW including support is available upon
request. Just write a mail to js@nil.im and we can find a reasonable solution
for both parties.
|
Modified build-aux/m4/buildsys.m4 from [90f081db1f] to [74391b1263].
1 2 3 4 5 | dnl dnl Copyright (c) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2016, 2017, dnl 2018, 2020 dnl Jonathan Schleifer <js@nil.im> dnl | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 | dnl dnl Copyright (c) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2016, 2017, dnl 2018, 2020 dnl Jonathan Schleifer <js@nil.im> dnl dnl https://fossil.nil.im/buildsys dnl dnl Permission to use, copy, modify, and/or distribute this software for any dnl purpose with or without fee is hereby granted, provided that the above dnl copyright notice and this permission notice is present in all copies. dnl dnl THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" dnl AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
| ︙ | ︙ |
Modified buildsys.mk.in from [32c1d977cd] to [f618b547b0].
1 2 3 4 5 | # # Copyright (c) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, # 2017, 2018, 2020 # Jonathan Schleifer <js@nil.im> # | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 | # # Copyright (c) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, # 2017, 2018, 2020 # Jonathan Schleifer <js@nil.im> # # https://fossil.nil.im/buildsys # # Permission to use, copy, modify, and/or distribute this software for any # purpose with or without fee is hereby granted, provided that the above # copyright notice and this permission notice is present in all copies. # # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
| ︙ | ︙ | |||
212 213 214 215 216 217 218 |
${MKDIR_P} ${COPY_HEADERS_DESTINATION} || exit $$?; \
${INSTALL} -m 644 $$i ${COPY_HEADERS_DESTINATION}/$$i || exit $$?; \
done \
fi
${AMIGA_LIB} ${AMIGA_LIB_NOINST}: ${EXT_DEPS} ${AMIGA_LIB_OBJS_START} ${AMIGA_LIB_OBJS} ${AMIGA_LIB_OBJS_EXTRA}
${LINK_STATUS}
| | | 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 |
${MKDIR_P} ${COPY_HEADERS_DESTINATION} || exit $$?; \
${INSTALL} -m 644 $$i ${COPY_HEADERS_DESTINATION}/$$i || exit $$?; \
done \
fi
${AMIGA_LIB} ${AMIGA_LIB_NOINST}: ${EXT_DEPS} ${AMIGA_LIB_OBJS_START} ${AMIGA_LIB_OBJS} ${AMIGA_LIB_OBJS_EXTRA}
${LINK_STATUS}
if ${LD} -o $@ ${AMIGA_LIB_OBJS_START} ${AMIGA_LIB_OBJS} ${AMIGA_LIB_OBJS_EXTRA} ${AMIGA_LIB_LDFLAGS} ${AMIGA_LIB_LIBS}; then \
${LINK_OK}; \
else \
${LINK_FAILED}; \
fi
${PLUGIN} ${PLUGIN_NOINST}: ${EXT_DEPS} ${PLUGIN_OBJS}
${LINK_STATUS}
|
| ︙ | ︙ |
Modified configure.ac from [b7c5e2f78b] to [e6fb754559].
| ︙ | ︙ | |||
56 57 58 59 60 61 62 | AS_IF([test x"$enable_amiga_lib" != x"no"], [ AC_SUBST(OBJFWRT_AMIGA_LIB, objfwrt68k.library) AC_SUBST(SFDC_TARGET, m68k-amigaos) AC_SUBST(SFD_FILE, amigaos3.sfd) AC_SUBST(SFDC_INLINE_H, inline.h) dnl For 68000, GCC emits calls to helper functions that dnl do not work properly in a library. | > | < | | 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 | AS_IF([test x"$enable_amiga_lib" != x"no"], [ AC_SUBST(OBJFWRT_AMIGA_LIB, objfwrt68k.library) AC_SUBST(SFDC_TARGET, m68k-amigaos) AC_SUBST(SFD_FILE, amigaos3.sfd) AC_SUBST(SFDC_INLINE_H, inline.h) dnl For 68000, GCC emits calls to helper functions that dnl do not work properly in a library. t="-mcpu=68020 -fbaserel -noixemul" AC_SUBST(AMIGA_LIB_CFLAGS, "$t -ffreestanding") AC_SUBST(AMIGA_LIB_LDFLAGS, "$t -resident -nostartfiles") ]) AC_SUBST(LIBBASES_M, libbases.m) ;; powerpc-*-amigaos*) CPPFLAGS="$CPPFLAGS -D__USE_INLINE__" |
| ︙ | ︙ | |||
87 88 89 90 91 92 93 | enable_files="yes" # Required for reading ENV: supports_amiga_lib="yes" check_pedantic="no" # Breaks generated inlines AS_IF([test x"$enable_amiga_lib" != x"no"], [ AC_SUBST(OBJFWRT_AMIGA_LIB, objfwrt.library) AC_SUBST(CVINCLUDE_INLINE_H, inline.h) | | | | 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 | enable_files="yes" # Required for reading ENV: supports_amiga_lib="yes" check_pedantic="no" # Breaks generated inlines AS_IF([test x"$enable_amiga_lib" != x"no"], [ AC_SUBST(OBJFWRT_AMIGA_LIB, objfwrt.library) AC_SUBST(CVINCLUDE_INLINE_H, inline.h) t="-mresident32 -ffreestanding -noixemul" AC_SUBST(AMIGA_LIB_CFLAGS, $t) t="-mresident32 -nostartfiles -nodefaultlibs" t="$t -noixemul -lc" AC_SUBST(AMIGA_LIB_LDFLAGS, $t) ]) AC_SUBST(LIBBASES_M, libbases.m) ]) enable_shared="no" |
| ︙ | ︙ | |||
247 248 249 250 251 252 253 254 255 256 257 258 259 260 | dnl accept everything used in ObjFW's assembly files. dnl Therefore, use the integrated assembler for ObjC dnl files, but not for assembly files. mips*-*-*) flag="-integrated-as" OBJCFLAGS="$OBJCFLAGS $flag" OBJFW_OBJCFLAGS="$OBJFW_OBJCFLAGS $flag" ;; dnl Clang's assembler on Windows is not complete yet dnl and cannot compile all .S files. *-*-mingw*) ASFLAGS="$ASFLAGS -no-integrated-as" ;; dnl Clang generates assembly output on SPARC64 that | > > > > > > > > | 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 | dnl accept everything used in ObjFW's assembly files. dnl Therefore, use the integrated assembler for ObjC dnl files, but not for assembly files. mips*-*-*) flag="-integrated-as" OBJCFLAGS="$OBJCFLAGS $flag" OBJFW_OBJCFLAGS="$OBJFW_OBJCFLAGS $flag" ;; dnl Don't use -no-integrated-as on Darwin. It breaks dnl building for the iOS simulator. i?86-*-darwin* | x86_64-*-darwin*) ;; dnl Many older Clang versions don't support jmp short. i?86-*-* | x86_64-*-*) ASFLAGS="$ASFLAGS -no-integrated-as" ;; dnl Clang's assembler on Windows is not complete yet dnl and cannot compile all .S files. *-*-mingw*) ASFLAGS="$ASFLAGS -no-integrated-as" ;; dnl Clang generates assembly output on SPARC64 that |
| ︙ | ︙ | |||
595 596 597 598 599 600 601 | AC_MSG_RESULT($exception_type) ], [ AC_MSG_RESULT(exceptions unavailable!) AC_MSG_ERROR([Exceptions not accepted by compiler!]) ]) | | | > | > | | | < | 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 | AC_MSG_RESULT($exception_type) ], [ AC_MSG_RESULT(exceptions unavailable!) AC_MSG_ERROR([Exceptions not accepted by compiler!]) ]) AC_SEARCH_LIBS($raise_exception, [c++abi gcc_s gcc], [ dnl c++abi requires pthread on OpenBSD AS_IF([test x"$ac_lib" = x"c++abi"], [ LIBS="$LIBS -lpthread" ]) ], [ AC_MSG_ERROR([$raise_exception missing!]) ], [-lpthread]) AC_CHECK_FUNCS(_Unwind_GetDataRelBase _Unwind_GetTextRelBase) ;; "Apple runtime") AC_DEFINE(OF_APPLE_RUNTIME, 1, [Whether we use the Apple ObjC runtime]) |
| ︙ | ︙ |
Modified extra.mk.in from [3e5ee59038] to [5aadeec76e].
1 2 3 | OBJFW_SHARED_LIB = @OBJFW_SHARED_LIB@ OBJFW_STATIC_LIB = @OBJFW_STATIC_LIB@ OBJFW_FRAMEWORK = @OBJFW_FRAMEWORK@ | < | 1 2 3 4 5 6 7 8 9 10 |
OBJFW_SHARED_LIB = @OBJFW_SHARED_LIB@
OBJFW_STATIC_LIB = @OBJFW_STATIC_LIB@
OBJFW_FRAMEWORK = @OBJFW_FRAMEWORK@
OBJFW_LIB_MAJOR = 9
OBJFW_LIB_MINOR = 0
OBJFW_LIB_MAJOR_MINOR = ${OBJFW_LIB_MAJOR}.${OBJFW_LIB_MINOR}
OBJFWRT_SHARED_LIB = @OBJFWRT_SHARED_LIB@
OBJFWRT_STATIC_LIB = @OBJFWRT_STATIC_LIB@
OBJFWRT_FRAMEWORK = @OBJFWRT_FRAMEWORK@
|
| ︙ | ︙ |
Modified src/Makefile from [e61ecc40cc] to [ac1d410da3].
1 2 3 4 |
include ../extra.mk
SUBDIRS = ${RUNTIME} exceptions ${ENCODINGS} forwarding
SUBDIRS_AFTER = ${BRIDGE}
| | | 1 2 3 4 5 6 7 8 9 10 11 12 |
include ../extra.mk
SUBDIRS = ${RUNTIME} exceptions ${ENCODINGS} forwarding
SUBDIRS_AFTER = ${BRIDGE}
DISTCLEAN = Info.plist objfw-defs.h
SHARED_LIB = ${OBJFW_SHARED_LIB}
STATIC_LIB = ${OBJFW_STATIC_LIB}
FRAMEWORK = ${OBJFW_FRAMEWORK}
LIB_MAJOR = ${OBJFW_LIB_MAJOR}
LIB_MINOR = ${OBJFW_LIB_MINOR}
|
| ︙ | ︙ |
Modified src/OFAdjacentArray.m from [6b6ede6c8d] to [8ce426fd6f].
| ︙ | ︙ | |||
339 340 341 342 343 344 345 | objects: objects count: count_]; if (state->state >= count) return 0; state->state = (unsigned long)count; | | | 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 | objects: objects count: count_]; if (state->state >= count) return 0; state->state = (unsigned long)count; state->itemsPtr = (id *)_array.items; state->mutationsPtr = (unsigned long *)self; return (int)count; } #ifdef OF_HAVE_BLOCKS - (void)enumerateObjectsUsingBlock: (of_array_enumeration_block_t)block |
| ︙ | ︙ |
Modified src/OFApplication.m from [2e614ff495] to [818d93f949].
| ︙ | ︙ | |||
68 69 70 71 72 73 74 75 76 77 78 79 80 81 |
#ifdef OF_NINTENDO_DS
# define asm __asm__
# include <nds.h>
# undef asm
#endif
@interface OFApplication ()
- (instancetype)of_init OF_METHOD_FAMILY(init);
- (void)of_setArgumentCount: (int *)argc
andArgumentValues: (char **[])argv;
#ifdef OF_WINDOWS
- (void)of_setArgumentCount: (int)argc
andWideArgumentValues: (wchar_t *[])argv;
| > | 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 |
#ifdef OF_NINTENDO_DS
# define asm __asm__
# include <nds.h>
# undef asm
#endif
OF_DIRECT_MEMBERS
@interface OFApplication ()
- (instancetype)of_init OF_METHOD_FAMILY(init);
- (void)of_setArgumentCount: (int *)argc
andArgumentValues: (char **[])argv;
#ifdef OF_WINDOWS
- (void)of_setArgumentCount: (int)argc
andWideArgumentValues: (wchar_t *[])argv;
|
| ︙ | ︙ |
Modified src/OFArray+Private.h from [008c28aeb0] to [fad96984ad].
| ︙ | ︙ | |||
15 16 17 18 19 20 21 22 23 24 25 26 27 28 |
* file.
*/
#import "OFArray.h"
OF_ASSUME_NONNULL_BEGIN
@interface OFArrayEnumerator: OFEnumerator
{
OFArray *_array;
size_t _count;
unsigned long _mutations;
unsigned long *_Nullable _mutationsPtr;
size_t _position;
| > | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 |
* file.
*/
#import "OFArray.h"
OF_ASSUME_NONNULL_BEGIN
OF_DIRECT_MEMBERS
@interface OFArrayEnumerator: OFEnumerator
{
OFArray *_array;
size_t _count;
unsigned long _mutations;
unsigned long *_Nullable _mutationsPtr;
size_t _position;
|
| ︙ | ︙ |
Modified src/OFDNSResolver.h from [074bf54ace] to [f593d54e00].
| ︙ | ︙ | |||
61 62 63 64 65 66 67 | /*! The server was unable to process due to an internal error */ OF_DNS_RESOLVER_ERROR_SERVER_FAILURE, /*! The server returned an error that the domain does not exist */ OF_DNS_RESOLVER_ERROR_SERVER_NAME_ERROR, /*! The server does not have support for the requested query */ OF_DNS_RESOLVER_ERROR_SERVER_NOT_IMPLEMENTED, /*! The server refused the query */ | | > > | 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 | /*! The server was unable to process due to an internal error */ OF_DNS_RESOLVER_ERROR_SERVER_FAILURE, /*! The server returned an error that the domain does not exist */ OF_DNS_RESOLVER_ERROR_SERVER_NAME_ERROR, /*! The server does not have support for the requested query */ OF_DNS_RESOLVER_ERROR_SERVER_NOT_IMPLEMENTED, /*! The server refused the query */ OF_DNS_RESOLVER_ERROR_SERVER_REFUSED, /*! There was no name server to query */ OF_DNS_RESOLVER_ERROR_NO_NAME_SERVER } of_dns_resolver_error_t; /*! * @protocol OFDNSResolverQueryDelegate OFDNSResolver.h ObjFW/OFDNSResolver.h * * @brief A delegate for performed DNS queries. */ |
| ︙ | ︙ |
Modified src/OFDNSResolver.m from [5d30f91158] to [7061e87e9f].
| ︙ | ︙ | |||
61 62 63 64 65 66 67 68 69 70 71 72 73 74 |
#define CNAME_RECURSION 3
@interface OFDNSResolver () <OFUDPSocketDelegate, OFTCPSocketDelegate>
- (void)of_contextTimedOut: (OFDNSResolverContext *)context;
@end
@interface OFDNSResolverContext: OFObject
{
@public
OFDNSQuery *_query;
OFNumber *_ID;
OFDNSResolverSettings *_settings;
size_t _nameServersIndex;
| > | 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 |
#define CNAME_RECURSION 3
@interface OFDNSResolver () <OFUDPSocketDelegate, OFTCPSocketDelegate>
- (void)of_contextTimedOut: (OFDNSResolverContext *)context;
@end
OF_DIRECT_MEMBERS
@interface OFDNSResolverContext: OFObject
{
@public
OFDNSQuery *_query;
OFNumber *_ID;
OFDNSResolverSettings *_settings;
size_t _nameServersIndex;
|
| ︙ | ︙ | |||
814 815 816 817 818 819 820 821 822 823 824 825 826 827 |
/* Random, unused ID */
do {
ID = [OFNumber numberWithUInt16: (uint16_t)of_random()];
} while ([_queries objectForKey: ID] != nil);
if (query.domainName.UTF8StringLength > 253)
@throw [OFOutOfRangeException exception];
context = [[[OFDNSResolverContext alloc]
initWithQuery: query
ID: ID
settings: _settings
delegate: delegate] autorelease];
[self of_sendQueryForContext: context
| > > > > > > > > > > > | 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 |
/* Random, unused ID */
do {
ID = [OFNumber numberWithUInt16: (uint16_t)of_random()];
} while ([_queries objectForKey: ID] != nil);
if (query.domainName.UTF8StringLength > 253)
@throw [OFOutOfRangeException exception];
if (_settings->_nameServers.count == 0) {
id exception = [OFDNSQueryFailedException
exceptionWithQuery: query
error: OF_DNS_RESOLVER_ERROR_NO_NAME_SERVER];
[delegate resolver: self
didPerformQuery: query
response: nil
exception: exception];
return;
}
context = [[[OFDNSResolverContext alloc]
initWithQuery: query
ID: ID
settings: _settings
delegate: delegate] autorelease];
[self of_sendQueryForContext: context
|
| ︙ | ︙ | |||
876 877 878 879 880 881 882 | length: BUFFER_LENGTH]; #endif exception = [OFDNSQueryFailedException exceptionWithQuery: context->_query error: OF_DNS_RESOLVER_ERROR_TIMEOUT]; | < < | | | | | 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 |
length: BUFFER_LENGTH];
#endif
exception = [OFDNSQueryFailedException
exceptionWithQuery: context->_query
error: OF_DNS_RESOLVER_ERROR_TIMEOUT];
[context->_delegate resolver: self
didPerformQuery: context->_query
response: nil
exception: exception];
}
- (bool)of_handleResponseBuffer: (unsigned char *)buffer
length: (size_t)length
sender: (const of_socket_address_t *)sender
{
OFDictionary *answerRecords = nil, *authorityRecords = nil;
|
| ︙ | ︙ | |||
1037 1038 1039 1040 1041 1042 1043 |
} @catch (id e) {
exception = e;
}
if (exception != nil)
response = nil;
| < < | | | | | 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 |
} @catch (id e) {
exception = e;
}
if (exception != nil)
response = nil;
[context->_delegate resolver: self
didPerformQuery: context->_query
response: response
exception: exception];
return false;
}
- (bool)socket: (OFDatagramSocket *)sock
didReceiveIntoBuffer: (void *)buffer
length: (size_t)length
|
| ︙ | ︙ | |||
1271 1272 1273 1274 1275 1276 1277 |
while ((context = [enumerator nextObject]) != nil) {
OFDNSQueryFailedException *exception;
exception = [OFDNSQueryFailedException
exceptionWithQuery: context->_query
error: OF_DNS_RESOLVER_ERROR_CANCELED];
| < < | | | | | 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 |
while ((context = [enumerator nextObject]) != nil) {
OFDNSQueryFailedException *exception;
exception = [OFDNSQueryFailedException
exceptionWithQuery: context->_query
error: OF_DNS_RESOLVER_ERROR_CANCELED];
[context->_delegate resolver: self
didPerformQuery: context->_query
response: nil
exception: exception];
}
[_queries removeAllObjects];
objc_autoreleasePoolPop(pool);
}
@end
|
Modified src/OFData+CryptoHashing.m from [bef7610665] to [7fbcd74f01].
| ︙ | ︙ | |||
27 28 29 30 31 32 33 | #import "OFSHA256Hash.h" #import "OFSHA384Hash.h" #import "OFSHA512Hash.h" int _OFData_CryptoHashing_reference; @implementation OFData (CryptoHashing) | | | 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 |
#import "OFSHA256Hash.h"
#import "OFSHA384Hash.h"
#import "OFSHA512Hash.h"
int _OFData_CryptoHashing_reference;
@implementation OFData (CryptoHashing)
- (OFString *)of_cryptoHashWithClass: (Class <OFCryptoHash>)class OF_DIRECT
{
void *pool = objc_autoreleasePoolPush();
id <OFCryptoHash> hash =
[class cryptoHashWithAllowsSwappableMemory: true];
size_t digestSize = [class digestSize];
const unsigned char *digest;
char cString[digestSize * 2];
|
| ︙ | ︙ |
Modified src/OFDictionary.m from [473457960e] to [9428854186].
| ︙ | ︙ | |||
44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 |
- (OFString *)of_JSONRepresentationWithOptions: (int)options
depth: (size_t)depth;
@end
@interface OFDictionaryPlaceholder: OFDictionary
@end
@interface OFDictionaryObjectEnumerator: OFEnumerator
{
OFDictionary *_dictionary;
OFEnumerator *_keyEnumerator;
}
- (instancetype)initWithDictionary: (OFDictionary *)dictionary;
@end
@interface OFURLQueryPartAllowedCharacterSet: OFCharacterSet
+ (OFCharacterSet *)URLQueryPartAllowedCharacterSet;
@end
@implementation OFDictionaryPlaceholder
- (instancetype)init
{
| > > | 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 |
- (OFString *)of_JSONRepresentationWithOptions: (int)options
depth: (size_t)depth;
@end
@interface OFDictionaryPlaceholder: OFDictionary
@end
OF_DIRECT_MEMBERS
@interface OFDictionaryObjectEnumerator: OFEnumerator
{
OFDictionary *_dictionary;
OFEnumerator *_keyEnumerator;
}
- (instancetype)initWithDictionary: (OFDictionary *)dictionary;
@end
OF_DIRECT_MEMBERS
@interface OFURLQueryPartAllowedCharacterSet: OFCharacterSet
+ (OFCharacterSet *)URLQueryPartAllowedCharacterSet;
@end
@implementation OFDictionaryPlaceholder
- (instancetype)init
{
|
| ︙ | ︙ | |||
220 221 222 223 224 225 226 |
+ (instancetype)dictionary
{
return [[[self alloc] init] autorelease];
}
+ (instancetype)dictionaryWithDictionary: (OFDictionary *)dictionary
{
| > | | 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 |
+ (instancetype)dictionary
{
return [[[self alloc] init] autorelease];
}
+ (instancetype)dictionaryWithDictionary: (OFDictionary *)dictionary
{
return [[(OFDictionary *)[self alloc]
initWithDictionary: dictionary] autorelease];
}
+ (instancetype)dictionaryWithObject: (id)object
forKey: (id)key
{
return [[[self alloc] initWithObject: object
forKey: key] autorelease];
|
| ︙ | ︙ |
Modified src/OFEnumerator.h from [c01e86ac8b] to [8acf2a6a5e].
| ︙ | ︙ | |||
50 51 52 53 54 55 56 |
*/
#define of_fast_enumeration_state_t NSFastEnumerationState
#ifndef NSINTEGER_DEFINED
typedef struct {
/*! Arbitrary state information for the enumeration */
unsigned long state;
/*! Pointer to a C array of objects to return */
| | | 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 |
*/
#define of_fast_enumeration_state_t NSFastEnumerationState
#ifndef NSINTEGER_DEFINED
typedef struct {
/*! Arbitrary state information for the enumeration */
unsigned long state;
/*! Pointer to a C array of objects to return */
id __unsafe_unretained _Nullable *_Nullable itemsPtr;
/*! Arbitrary state information to detect mutations */
unsigned long *_Nullable mutationsPtr;
/*! Additional arbitrary state information */
unsigned long extra[5];
} of_fast_enumeration_state_t;
#endif
|
| ︙ | ︙ |
Modified src/OFEpollKernelEventObserver.m from [8fc6ef4b31] to [5306d06560].
| ︙ | ︙ | |||
88 89 90 91 92 93 94 |
[_FDToEvents release];
[super dealloc];
}
- (void)of_addObject: (id)object
fileDescriptor: (int)fd
| | | 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 |
[_FDToEvents release];
[super dealloc];
}
- (void)of_addObject: (id)object
fileDescriptor: (int)fd
events: (int)addEvents OF_DIRECT
{
struct epoll_event event;
intptr_t events;
events = (intptr_t)[_FDToEvents
objectForKey: (void *)((intptr_t)fd + 1)];
|
| ︙ | ︙ | |||
111 112 113 114 115 116 117 | [_FDToEvents setObject: (void *)(events | addEvents) forKey: (void *)((intptr_t)fd + 1)]; } - (void)of_removeObject: (id)object fileDescriptor: (int)fd | | | 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 |
[_FDToEvents setObject: (void *)(events | addEvents)
forKey: (void *)((intptr_t)fd + 1)];
}
- (void)of_removeObject: (id)object
fileDescriptor: (int)fd
events: (int)removeEvents OF_DIRECT
{
intptr_t events;
events = (intptr_t)[_FDToEvents
objectForKey: (void *)((intptr_t)fd + 1)];
events &= ~removeEvents;
|
| ︙ | ︙ |
Modified src/OFFileURLHandler.h from [852f35b467] to [8275bdd541].
| ︙ | ︙ | |||
16 17 18 19 20 21 22 | */ #import "OFURLHandler.h" OF_ASSUME_NONNULL_BEGIN @interface OFFileURLHandler: OFURLHandler | | | 16 17 18 19 20 21 22 23 24 25 26 | */ #import "OFURLHandler.h" OF_ASSUME_NONNULL_BEGIN @interface OFFileURLHandler: OFURLHandler + (bool)of_directoryExistsAtPath: (OFString *)path OF_DIRECT; @end OF_ASSUME_NONNULL_END |
Modified src/OFFileURLHandler.m from [b6ef19d4e0] to [b404d9c716].
| ︙ | ︙ | |||
14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 | * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #include <errno.h> #ifdef HAVE_DIRENT_H # include <dirent.h> #endif #include "unistd_wrapper.h" #ifdef HAVE_SYS_STAT_H # include <sys/stat.h> #endif #ifdef HAVE_PWD_H # include <pwd.h> #endif #ifdef HAVE_GRP_H # include <grp.h> | > > > > > > | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 | * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #include <errno.h> #include <math.h> #ifdef HAVE_DIRENT_H # include <dirent.h> #endif #include "unistd_wrapper.h" #import "platform.h" #ifdef HAVE_SYS_STAT_H # include <sys/stat.h> #endif #include <sys/time.h> #ifdef OF_WINDOWS # include <utime.h> #endif #ifdef HAVE_PWD_H # include <pwd.h> #endif #ifdef HAVE_GRP_H # include <grp.h> |
| ︙ | ︙ | |||
105 106 107 108 109 110 111 112 113 114 115 116 117 118 |
static OFMutex *passwdMutex;
#endif
#if !defined(HAVE_READDIR_R) && defined(OF_HAVE_THREADS) && !defined(OF_WINDOWS)
static OFMutex *readdirMutex;
#endif
#ifdef OF_WINDOWS
static WINAPI BOOLEAN (*func_CreateSymbolicLinkW)(LPCWSTR, LPCWSTR, DWORD);
static WINAPI BOOLEAN (*func_CreateHardLinkW)(LPCWSTR, LPCWSTR,
LPSECURITY_ATTRIBUTES);
#endif
#ifdef OF_WINDOWS
static of_time_interval_t
| > | 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 |
static OFMutex *passwdMutex;
#endif
#if !defined(HAVE_READDIR_R) && defined(OF_HAVE_THREADS) && !defined(OF_WINDOWS)
static OFMutex *readdirMutex;
#endif
#ifdef OF_WINDOWS
static int (*func__wutime64)(const wchar_t *, struct __utimbuf64 *);
static WINAPI BOOLEAN (*func_CreateSymbolicLinkW)(LPCWSTR, LPCWSTR, DWORD);
static WINAPI BOOLEAN (*func_CreateHardLinkW)(LPCWSTR, LPCWSTR,
LPSECURITY_ATTRIBUTES);
#endif
#ifdef OF_WINDOWS
static of_time_interval_t
|
| ︙ | ︙ | |||
139 140 141 142 143 144 145 146 147 148 149 150 151 152 |
return;
case ERROR_NOT_READY:
errno = EBUSY;
return;
}
errno = 0;
}
#endif
static int
of_stat(OFString *path, of_stat_t *buffer)
{
#if defined(OF_WINDOWS)
| > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 |
return;
case ERROR_NOT_READY:
errno = EBUSY;
return;
}
errno = 0;
}
#endif
#ifdef OF_AMIGAOS
static void
setErrno(void)
{
switch (IoErr()) {
case ERROR_DELETE_PROTECTED:
case ERROR_READ_PROTECTED:
case ERROR_WRITE_PROTECTED:
errno = EACCES;
break;
case ERROR_DISK_NOT_VALIDATED:
case ERROR_OBJECT_IN_USE:
errno = EBUSY;
break;
case ERROR_OBJECT_EXISTS:
errno = EEXIST;
break;
case ERROR_DIR_NOT_FOUND:
case ERROR_NO_MORE_ENTRIES:
case ERROR_OBJECT_NOT_FOUND:
errno = ENOENT;
break;
case ERROR_NO_FREE_STORE:
errno = ENOMEM;
break;
case ERROR_DISK_FULL:
errno = ENOSPC;
break;
case ERROR_DIRECTORY_NOT_EMPTY:
errno = ENOTEMPTY;
break;
case ERROR_DISK_WRITE_PROTECTED:
errno = EROFS;
break;
case ERROR_RENAME_ACROSS_DEVICES:
errno = EXDEV;
break;
default:
errno = 0;
break;
}
}
#endif
static int
of_stat(OFString *path, of_stat_t *buffer)
{
#if defined(OF_WINDOWS)
|
| ︙ | ︙ | |||
221 222 223 224 225 226 227 |
# endif
of_time_interval_t timeInterval;
struct Locale *locale;
struct DateStamp *date;
if ((lock = Lock([path cStringWithEncoding: [OFLocale encoding]],
SHARED_LOCK)) == 0) {
| < < < < < < < < < | < < < | 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 |
# endif
of_time_interval_t timeInterval;
struct Locale *locale;
struct DateStamp *date;
if ((lock = Lock([path cStringWithEncoding: [OFLocale encoding]],
SHARED_LOCK)) == 0) {
setErrno();
return -1;
}
# ifdef OF_AMIGAOS4
if ((ed = ExamineObjectTags(EX_FileLockInput, lock, TAG_END)) == NULL) {
# else
if (!Examine(lock, &fib)) {
|
| ︙ | ︙ | |||
509 510 511 512 513 514 515 516 517 518 519 520 521 522 |
passwdMutex = [[OFMutex alloc] init];
#endif
#if !defined(HAVE_READDIR_R) && !defined(OF_WINDOWS) && defined(OF_HAVE_THREADS)
readdirMutex = [[OFMutex alloc] init];
#endif
#ifdef OF_WINDOWS
if ((module = LoadLibrary("kernel32.dll")) != NULL) {
func_CreateSymbolicLinkW =
(WINAPI BOOLEAN (*)(LPCWSTR, LPCWSTR, DWORD))
GetProcAddress(module, "CreateSymbolicLinkW");
func_CreateHardLinkW =
(WINAPI BOOLEAN (*)(LPCWSTR, LPCWSTR,
LPSECURITY_ATTRIBUTES))
| > > > > | 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 |
passwdMutex = [[OFMutex alloc] init];
#endif
#if !defined(HAVE_READDIR_R) && !defined(OF_WINDOWS) && defined(OF_HAVE_THREADS)
readdirMutex = [[OFMutex alloc] init];
#endif
#ifdef OF_WINDOWS
if ((module = LoadLibrary("msvcrt.dll")) != NULL)
func__wutime64 = (int (*)(const wchar_t *,
struct __utimbuf64 *))GetProcAddress(module, "_wutime64");
if ((module = LoadLibrary("kernel32.dll")) != NULL) {
func_CreateSymbolicLinkW =
(WINAPI BOOLEAN (*)(LPCWSTR, LPCWSTR, DWORD))
GetProcAddress(module, "CreateSymbolicLinkW");
func_CreateHardLinkW =
(WINAPI BOOLEAN (*)(LPCWSTR, LPCWSTR,
LPSECURITY_ATTRIBUTES))
|
| ︙ | ︙ | |||
593 594 595 596 597 598 599 600 601 602 | setSymbolicLinkDestinationAttribute(ret, URL); #endif objc_autoreleasePoolPop(pool); return ret; } - (void)of_setPOSIXPermissions: (OFNumber *)permissions ofItemAtURL: (OFURL *)URL | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 |
setSymbolicLinkDestinationAttribute(ret, URL);
#endif
objc_autoreleasePoolPop(pool);
return ret;
}
- (void)of_setLastAccessDate: (OFDate *)lastAccessDate
andModificationDate: (OFDate *)modificationDate
ofItemAtURL: (OFURL *)URL
attributes: (of_file_attributes_t)attributes OF_DIRECT
{
OFString *path = URL.fileSystemRepresentation;
of_file_attribute_key_t attributeKey = (modificationDate != nil
? of_file_attribute_key_modification_date
: of_file_attribute_key_last_access_date);
if (lastAccessDate == nil)
lastAccessDate = modificationDate;
if (modificationDate == nil)
modificationDate = lastAccessDate;
#if defined(OF_WINDOWS)
if (func__wutime64 != NULL) {
struct __utimbuf64 times = {
.actime =
(__time64_t)lastAccessDate.timeIntervalSince1970,
.modtime =
(__time64_t)modificationDate.timeIntervalSince1970
};
if (func__wutime64([path UTF16String], ×) != 0)
@throw [OFSetItemAttributesFailedException
exceptionWithURL: URL
attributes: attributes
failedAttribute: attributeKey
errNo: errno];
} else {
struct _utimbuf times = {
.actime = (time_t)lastAccessDate.timeIntervalSince1970,
.modtime =
(time_t)modificationDate.timeIntervalSince1970
};
int status;
if ([OFSystemInfo isWindowsNT])
status = _wutime([path UTF16String], ×);
else
status = _utime(
[path cStringWithEncoding: [OFLocale encoding]],
×);
if (status != 0)
@throw [OFSetItemAttributesFailedException
exceptionWithURL: URL
attributes: attributes
failedAttribute: attributeKey
errNo: errno];
}
#elif defined(OF_AMIGAOS)
/* AmigaOS does not support access time. */
of_time_interval_t modificationTime =
modificationDate.timeIntervalSince1970;
struct Locale *locale;
struct DateStamp date;
modificationTime -= 252460800; /* 1978-01-01 */
if (modificationTime < 0)
@throw [OFOutOfRangeException exception];
locale = OpenLocale(NULL);
/*
* FIXME: This does not take DST into account. But unfortunately, there
* is no way to figure out if DST should be in effect for the
* timestamp.
*/
modificationTime -= locale->loc_GMTOffset * 60.0;
CloseLocale(locale);
date.ds_Days = modificationTime / 86400;
date.ds_Minute = ((LONG)modificationTime % 86400) / 60;
date.ds_Tick = fmod(modificationTime, 60) * TICKS_PER_SECOND;
if (!SetFileDate([path cStringWithEncoding: [OFLocale encoding]],
&date) != 0) {
setErrno();
@throw [OFSetItemAttributesFailedException
exceptionWithURL: URL
attributes: attributes
failedAttribute: attributeKey
errNo: errno];
}
#else
of_time_interval_t lastAccessTime =
lastAccessDate.timeIntervalSince1970;
of_time_interval_t modificationTime =
modificationDate.timeIntervalSince1970;
struct timeval times[2] = {
{
.tv_sec = (time_t)lastAccessTime,
.tv_usec =
(int)((lastAccessTime - times[0].tv_sec) * 1000)
},
{
.tv_sec = (time_t)modificationTime,
.tv_usec =
(int)((modificationTime - times[1].tv_sec) * 1000)
},
};
if (utimes([path cStringWithEncoding: [OFLocale encoding]], times) != 0)
@throw [OFSetItemAttributesFailedException
exceptionWithURL: URL
attributes: attributes
failedAttribute: attributeKey
errNo: errno];
#endif
}
- (void)of_setPOSIXPermissions: (OFNumber *)permissions
ofItemAtURL: (OFURL *)URL
attributes: (of_file_attributes_t)attributes OF_DIRECT
{
#ifdef OF_FILE_MANAGER_SUPPORTS_PERMISSIONS
uint16_t mode = permissions.uInt16Value & 0777;
OFString *path = URL.fileSystemRepresentation;
int status;
# ifdef OF_WINDOWS
|
| ︙ | ︙ | |||
626 627 628 629 630 631 632 |
#endif
}
- (void)of_setOwner: (OFString *)owner
andGroup: (OFString *)group
ofItemAtURL: (OFURL *)URL
attributeKey: (of_file_attribute_key_t)attributeKey
| | | 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 |
#endif
}
- (void)of_setOwner: (OFString *)owner
andGroup: (OFString *)group
ofItemAtURL: (OFURL *)URL
attributeKey: (of_file_attribute_key_t)attributeKey
attributes: (of_file_attributes_t)attributes OF_DIRECT
{
#ifdef OF_FILE_MANAGER_SUPPORTS_OWNER
OFString *path = URL.fileSystemRepresentation;
uid_t uid = -1;
gid_t gid = -1;
of_string_encoding_t encoding;
|
| ︙ | ︙ | |||
695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 |
ofItemAtURL: (OFURL *)URL
{
void *pool = objc_autoreleasePoolPush();
OFEnumerator OF_GENERIC(of_file_attribute_key_t) *keyEnumerator;
OFEnumerator *objectEnumerator;
of_file_attribute_key_t key;
id object;
if (URL == nil)
@throw [OFInvalidArgumentException exception];
if (![URL.scheme isEqual: _scheme])
@throw [OFInvalidArgumentException exception];
keyEnumerator = [attributes keyEnumerator];
objectEnumerator = [attributes objectEnumerator];
while ((key = [keyEnumerator nextObject]) != nil &&
(object = [objectEnumerator nextObject]) != nil) {
| > | > > > > > > > > > > > > > > | 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 |
ofItemAtURL: (OFURL *)URL
{
void *pool = objc_autoreleasePoolPush();
OFEnumerator OF_GENERIC(of_file_attribute_key_t) *keyEnumerator;
OFEnumerator *objectEnumerator;
of_file_attribute_key_t key;
id object;
OFDate *lastAccessDate, *modificationDate;
if (URL == nil)
@throw [OFInvalidArgumentException exception];
if (![URL.scheme isEqual: _scheme])
@throw [OFInvalidArgumentException exception];
keyEnumerator = [attributes keyEnumerator];
objectEnumerator = [attributes objectEnumerator];
while ((key = [keyEnumerator nextObject]) != nil &&
(object = [objectEnumerator nextObject]) != nil) {
if ([key isEqual: of_file_attribute_key_modification_date] ||
[key isEqual: of_file_attribute_key_last_access_date])
continue;
else if ([key isEqual: of_file_attribute_key_posix_permissions])
[self of_setPOSIXPermissions: object
ofItemAtURL: URL
attributes: attributes];
else if ([key isEqual: of_file_attribute_key_owner])
[self of_setOwner: object
andGroup: nil
ofItemAtURL: URL
attributeKey: key
attributes: attributes];
else if ([key isEqual: of_file_attribute_key_group])
[self of_setOwner: nil
andGroup: object
ofItemAtURL: URL
attributeKey: key
attributes: attributes];
else
@throw [OFNotImplementedException
exceptionWithSelector: _cmd
object: self];
}
lastAccessDate = [attributes
objectForKey: of_file_attribute_key_last_access_date];
modificationDate = [attributes
objectForKey: of_file_attribute_key_modification_date];
if (lastAccessDate != nil || modificationDate != nil)
[self of_setLastAccessDate: lastAccessDate
andModificationDate: modificationDate
ofItemAtURL: URL
attributes: attributes];
objc_autoreleasePoolPop(pool);
}
- (bool)fileExistsAtURL: (OFURL *)URL
{
void *pool = objc_autoreleasePoolPush();
|
| ︙ | ︙ | |||
811 812 813 814 815 816 817 |
exceptionWithURL: URL
errNo: errno];
#elif defined(OF_AMIGAOS)
BPTR lock;
if ((lock = CreateDir(
[path cStringWithEncoding: [OFLocale encoding]])) == 0) {
| < | < < < < < < < < < < < < < < < < < < < < < | < | | 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 |
exceptionWithURL: URL
errNo: errno];
#elif defined(OF_AMIGAOS)
BPTR lock;
if ((lock = CreateDir(
[path cStringWithEncoding: [OFLocale encoding]])) == 0) {
setErrno();
@throw [OFCreateDirectoryFailedException
exceptionWithURL: URL
errNo: errno];
}
UnLock(lock);
#else
if (mkdir([path cStringWithEncoding: [OFLocale encoding]], 0777) != 0)
@throw [OFCreateDirectoryFailedException
exceptionWithURL: URL
|
| ︙ | ︙ | |||
963 964 965 966 967 968 969 |
}
#elif defined(OF_AMIGAOS)
of_string_encoding_t encoding = [OFLocale encoding];
BPTR lock;
if ((lock = Lock([path cStringWithEncoding: encoding],
SHARED_LOCK)) == 0) {
| < | < < < < < < < < < < < < | | 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 |
}
#elif defined(OF_AMIGAOS)
of_string_encoding_t encoding = [OFLocale encoding];
BPTR lock;
if ((lock = Lock([path cStringWithEncoding: encoding],
SHARED_LOCK)) == 0) {
setErrno();
@throw [OFOpenItemFailedException exceptionWithURL: URL
mode: nil
errNo: errno];
}
@try {
# ifdef OF_AMIGAOS4
struct ExamineData *ed;
APTR context;
|
| ︙ | ︙ | |||
1199 1200 1201 1202 1203 1204 1205 |
exceptionWithURL: URL
errNo: errno];
#endif
}
#ifdef OF_AMIGAOS
if (!DeleteFile([path cStringWithEncoding: [OFLocale encoding]])) {
| < | < < < < < < < < < < < < < < < < < | < | | 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 |
exceptionWithURL: URL
errNo: errno];
#endif
}
#ifdef OF_AMIGAOS
if (!DeleteFile([path cStringWithEncoding: [OFLocale encoding]])) {
setErrno();
@throw [OFRemoveItemFailedException exceptionWithURL: URL
errNo: errno];
}
#endif
objc_autoreleasePoolPop(pool);
}
#ifdef OF_FILE_MANAGER_SUPPORTS_LINKS
|
| ︙ | ︙ | |||
1335 1336 1337 1338 1339 1340 1341 |
#ifdef OF_AMIGAOS
of_string_encoding_t encoding = [OFLocale encoding];
if (!Rename([source.fileSystemRepresentation
cStringWithEncoding: encoding],
[destination.fileSystemRepresentation
cStringWithEncoding: encoding])) {
| < | < < < < < < < < < < < < < < < < < < < < < | | 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 |
#ifdef OF_AMIGAOS
of_string_encoding_t encoding = [OFLocale encoding];
if (!Rename([source.fileSystemRepresentation
cStringWithEncoding: encoding],
[destination.fileSystemRepresentation
cStringWithEncoding: encoding])) {
setErrno();
@throw [OFMoveItemFailedException
exceptionWithSourceURL: source
destinationURL: destination
errNo: errno];
}
#else
int status;
# ifdef OF_WINDOWS
if ([OFSystemInfo isWindowsNT])
status = _wrename(source.fileSystemRepresentation.UTF16String,
|
| ︙ | ︙ |
Modified src/OFGZIPStream.h from [e0031d8a51] to [6ecb57a815].
| ︙ | ︙ | |||
36 37 38 39 40 41 42 |
enum of_gzip_stream_state {
OF_GZIP_STREAM_ID1,
OF_GZIP_STREAM_ID2,
OF_GZIP_STREAM_COMPRESSION_METHOD,
OF_GZIP_STREAM_FLAGS,
OF_GZIP_STREAM_MODIFICATION_TIME,
OF_GZIP_STREAM_EXTRA_FLAGS,
| | | | | | | | | | | | | | | | | | | > > > > > > > > > > > > > > > > > | 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 |
enum of_gzip_stream_state {
OF_GZIP_STREAM_ID1,
OF_GZIP_STREAM_ID2,
OF_GZIP_STREAM_COMPRESSION_METHOD,
OF_GZIP_STREAM_FLAGS,
OF_GZIP_STREAM_MODIFICATION_TIME,
OF_GZIP_STREAM_EXTRA_FLAGS,
OF_GZIP_STREAM_OPERATING_SYSTEM,
OF_GZIP_STREAM_EXTRA_LENGTH,
OF_GZIP_STREAM_EXTRA,
OF_GZIP_STREAM_NAME,
OF_GZIP_STREAM_COMMENT,
OF_GZIP_STREAM_HEADER_CRC16,
OF_GZIP_STREAM_DATA,
OF_GZIP_STREAM_CRC32,
OF_GZIP_STREAM_UNCOMPRESSED_SIZE
} _state;
enum of_gzip_stream_flags {
OF_GZIP_STREAM_FLAG_TEXT = 0x01,
OF_GZIP_STREAM_FLAG_HEADER_CRC16 = 0x02,
OF_GZIP_STREAM_FLAG_EXTRA = 0x04,
OF_GZIP_STREAM_FLAG_NAME = 0x08,
OF_GZIP_STREAM_FLAG_COMMENT = 0x10
} _flags;
uint8_t _extraFlags;
enum of_gzip_stream_operating_system {
OF_GZIP_STREAM_OPERATING_SYSTEM_FAT = 0,
OF_GZIP_STREAM_OPERATING_SYSTEM_AMIGA = 1,
OF_GZIP_STREAM_OPERATING_SYSTEM_VMS = 2,
OF_GZIP_STREAM_OPERATING_SYSTEM_UNIX = 3,
OF_GZIP_STREAM_OPERATING_SYSTEM_VM_CMS = 4,
OF_GZIP_STREAM_OPERATING_SYSTEM_ATARI_TOS = 5,
OF_GZIP_STREAM_OPERATING_SYSTEM_HPFS = 6,
OF_GZIP_STREAM_OPERATING_SYSTEM_MACINTOSH = 7,
OF_GZIP_STREAM_OPERATING_SYSTEM_Z_SYSTEM = 8,
OF_GZIP_STREAM_OPERATING_SYSTEM_CP_M = 9,
OF_GZIP_STREAM_OPERATING_SYSTEM_TOPS_20 = 10,
OF_GZIP_STREAM_OPERATING_SYSTEM_NTFS = 11,
OF_GZIP_STREAM_OPERATING_SYSTEM_QDO = 12,
OF_GZIP_STREAM_OPERATING_SYSTEM_ACORN_RISC_OS = 13,
OF_GZIP_STREAM_OPERATING_SYSTEM_UNKNOWN = 255
} _operatingSystemMadeOn;
size_t _bytesRead;
uint8_t _buffer[4];
OFDate *_Nullable _modificationDate;
uint16_t _extraLength;
uint32_t _CRC32, _uncompressedSize;
}
/*!
* @brief The operating system on which the data was compressed.
*
* This property is only guaranteed to be available once @ref atEndOfStream is
* true.
*/
@property (readonly, nonatomic)
enum of_gzip_stream_operating_system operatingSystemMadeOn;
/*!
* @brief The modification date of the original file.
*
* This property is only guaranteed to be available once @ref atEndOfStream is
* true.
*/
@property OF_NULLABLE_PROPERTY (readonly, nonatomic) OFDate *modificationDate;
/*!
* @brief Creates a new OFGZIPStream with the specified underlying stream.
*
* @param stream The underlying stream for the OFGZIPStream
* @param mode The mode for the OFGZIPStream. Valid modes are "r" for reading
* and "w" for writing.
* @return A new, autoreleased OFGZIPStream
|
| ︙ | ︙ |
Modified src/OFGZIPStream.m from [f8e93c416d] to [42379805f3].
| ︙ | ︙ | |||
26 27 28 29 30 31 32 33 34 35 36 37 38 39 |
#import "OFChecksumMismatchException.h"
#import "OFInvalidFormatException.h"
#import "OFNotImplementedException.h"
#import "OFNotOpenException.h"
#import "OFTruncatedDataException.h"
@implementation OFGZIPStream
+ (instancetype)streamWithStream: (OFStream *)stream
mode: (OFString *)mode
{
return [[[self alloc] initWithStream: stream
mode: mode] autorelease];
}
| > > > | 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 |
#import "OFChecksumMismatchException.h"
#import "OFInvalidFormatException.h"
#import "OFNotImplementedException.h"
#import "OFNotOpenException.h"
#import "OFTruncatedDataException.h"
@implementation OFGZIPStream
@synthesize operatingSystemMadeOn = _operatingSystemMadeOn;
@synthesize modificationDate = _modificationDate;
+ (instancetype)streamWithStream: (OFStream *)stream
mode: (OFString *)mode
{
return [[[self alloc] initWithStream: stream
mode: mode] autorelease];
}
|
| ︙ | ︙ | |||
50 51 52 53 54 55 56 57 58 59 60 61 62 63 |
@try {
if (![mode isEqual: @"r"])
@throw [OFNotImplementedException
exceptionWithSelector: _cmd
object: nil];
_stream = [stream retain];
_CRC32 = ~0;
} @catch (id e) {
[self release];
@throw e;
}
return self;
| > > | 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 |
@try {
if (![mode isEqual: @"r"])
@throw [OFNotImplementedException
exceptionWithSelector: _cmd
object: nil];
_stream = [stream retain];
_operatingSystemMadeOn =
OF_GZIP_STREAM_OPERATING_SYSTEM_UNKNOWN;
_CRC32 = ~0;
} @catch (id e) {
[self release];
@throw e;
}
return self;
|
| ︙ | ︙ | |||
138 139 140 141 142 143 144 | if ([_stream readIntoBuffer: &byte length: 1] < 1) return 0; _extraFlags = byte; _state++; break; | | | | 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 |
if ([_stream readIntoBuffer: &byte
length: 1] < 1)
return 0;
_extraFlags = byte;
_state++;
break;
case OF_GZIP_STREAM_OPERATING_SYSTEM:
if ([_stream readIntoBuffer: &byte
length: 1] < 1)
return 0;
_operatingSystemMadeOn = byte;
_state++;
break;
case OF_GZIP_STREAM_EXTRA_LENGTH:
if (!(_flags & OF_GZIP_STREAM_FLAG_EXTRA)) {
_state += 2;
break;
}
|
| ︙ | ︙ |
Modified src/OFHTTPClient.m from [7d20d55912] to [8dda35db24].
| ︙ | ︙ | |||
49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 |
#import "OFUnsupportedVersionException.h"
#import "OFWriteFailedException.h"
#import "socket_helpers.h"
#define REDIRECTS_DEFAULT 10
@interface OFHTTPClientRequestHandler: OFObject <OFTCPSocketDelegate>
{
@public
OFHTTPClient *_client;
OFHTTPRequest *_request;
unsigned int _redirects;
bool _firstLine;
OFString *_version;
int _status;
OFMutableDictionary OF_GENERIC(OFString *, OFString *) *_serverHeaders;
}
- (instancetype)initWithClient: (OFHTTPClient *)client
request: (OFHTTPRequest *)request
redirects: (unsigned int)redirects;
- (void)start;
- (void)closeAndReconnect;
@end
@interface OFHTTPClientRequestBodyStream: OFStream <OFReadyForWritingObserving>
{
OFHTTPClientRequestHandler *_handler;
OFTCPSocket *_socket;
bool _chunked;
uintmax_t _toWrite;
bool _atEndOfStream;
}
- (instancetype)initWithHandler: (OFHTTPClientRequestHandler *)handler
socket: (OFTCPSocket *)sock;
@end
@interface OFHTTPClientResponse: OFHTTPResponse <OFReadyForReadingObserving>
{
OFTCPSocket *_socket;
bool _hasContentLength, _chunked, _keepAlive;
bool _atEndOfStream, _setAtEndOfStream;
intmax_t _toRead;
}
@property (nonatomic, setter=of_setKeepAlive:) bool of_keepAlive;
- (instancetype)initWithSocket: (OFTCPSocket *)sock;
@end
@interface OFHTTPClientSyncPerformer: OFObject <OFHTTPClientDelegate>
{
OFHTTPClient *_client;
OFObject <OFHTTPClientDelegate> *_delegate;
OFHTTPResponse *_response;
}
| > > > > | 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 |
#import "OFUnsupportedVersionException.h"
#import "OFWriteFailedException.h"
#import "socket_helpers.h"
#define REDIRECTS_DEFAULT 10
OF_DIRECT_MEMBERS
@interface OFHTTPClientRequestHandler: OFObject <OFTCPSocketDelegate>
{
@public
OFHTTPClient *_client;
OFHTTPRequest *_request;
unsigned int _redirects;
bool _firstLine;
OFString *_version;
int _status;
OFMutableDictionary OF_GENERIC(OFString *, OFString *) *_serverHeaders;
}
- (instancetype)initWithClient: (OFHTTPClient *)client
request: (OFHTTPRequest *)request
redirects: (unsigned int)redirects;
- (void)start;
- (void)closeAndReconnect;
@end
OF_DIRECT_MEMBERS
@interface OFHTTPClientRequestBodyStream: OFStream <OFReadyForWritingObserving>
{
OFHTTPClientRequestHandler *_handler;
OFTCPSocket *_socket;
bool _chunked;
uintmax_t _toWrite;
bool _atEndOfStream;
}
- (instancetype)initWithHandler: (OFHTTPClientRequestHandler *)handler
socket: (OFTCPSocket *)sock;
@end
OF_DIRECT_MEMBERS
@interface OFHTTPClientResponse: OFHTTPResponse <OFReadyForReadingObserving>
{
OFTCPSocket *_socket;
bool _hasContentLength, _chunked, _keepAlive;
bool _atEndOfStream, _setAtEndOfStream;
intmax_t _toRead;
}
@property (nonatomic, setter=of_setKeepAlive:) bool of_keepAlive;
- (instancetype)initWithSocket: (OFTCPSocket *)sock;
@end
OF_DIRECT_MEMBERS
@interface OFHTTPClientSyncPerformer: OFObject <OFHTTPClientDelegate>
{
OFHTTPClient *_client;
OFObject <OFHTTPClientDelegate> *_delegate;
OFHTTPResponse *_response;
}
|
| ︙ | ︙ |
Modified src/OFHTTPResponse.h from [453ae309af] to [8433880375].
| ︙ | ︙ | |||
70 71 72 73 74 75 76 77 78 79 80 81 82 |
*/
- (OFString *)stringWithEncoding: (of_string_encoding_t)encoding;
@end
#ifdef __cplusplus
extern "C" {
#endif
extern OFString *_Nonnull of_http_status_code_to_string(short code);
#ifdef __cplusplus
}
#endif
OF_ASSUME_NONNULL_END
| > > > > > > | 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 |
*/
- (OFString *)stringWithEncoding: (of_string_encoding_t)encoding;
@end
#ifdef __cplusplus
extern "C" {
#endif
/*!
* @brief Returns a description string for the specified HTTP status code.
*
* @param code The HTTP status code to return a description string for
* @return A description string for the specified HTTP status code
*/
extern OFString *_Nonnull of_http_status_code_to_string(short code);
#ifdef __cplusplus
}
#endif
OF_ASSUME_NONNULL_END
|
Modified src/OFHTTPServer.m from [9e1f23cc19] to [868929166e].
| ︙ | ︙ | |||
53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 |
* FIXME: Key normalization replaces headers like "DNT" with "Dnt".
* FIXME: Errors are not reported to the user.
*/
@interface OFHTTPServer () <OFTCPSocketDelegate>
@end
@interface OFHTTPServerResponse: OFHTTPResponse <OFReadyForWritingObserving>
{
OFStreamSocket *_socket;
OFHTTPServer *_server;
OFHTTPRequest *_request;
bool _chunked, _headersSent;
}
- (instancetype)initWithSocket: (OFStreamSocket *)sock
server: (OFHTTPServer *)server
request: (OFHTTPRequest *)request;
@end
@interface OFHTTPServerConnection: OFObject <OFTCPSocketDelegate>
{
@public
OFStreamSocket *_socket;
OFHTTPServer *_server;
OFTimer *_timer;
enum {
| > > | 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 |
* FIXME: Key normalization replaces headers like "DNT" with "Dnt".
* FIXME: Errors are not reported to the user.
*/
@interface OFHTTPServer () <OFTCPSocketDelegate>
@end
OF_DIRECT_MEMBERS
@interface OFHTTPServerResponse: OFHTTPResponse <OFReadyForWritingObserving>
{
OFStreamSocket *_socket;
OFHTTPServer *_server;
OFHTTPRequest *_request;
bool _chunked, _headersSent;
}
- (instancetype)initWithSocket: (OFStreamSocket *)sock
server: (OFHTTPServer *)server
request: (OFHTTPRequest *)request;
@end
OF_DIRECT_MEMBERS
@interface OFHTTPServerConnection: OFObject <OFTCPSocketDelegate>
{
@public
OFStreamSocket *_socket;
OFHTTPServer *_server;
OFTimer *_timer;
enum {
|
| ︙ | ︙ | |||
94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 |
server: (OFHTTPServer *)server;
- (bool)parseProlog: (OFString *)line;
- (bool)parseHeaders: (OFString *)line;
- (bool)sendErrorAndClose: (short)statusCode;
- (void)createResponse;
@end
@interface OFHTTPServerRequestBodyStream: OFStream <OFReadyForReadingObserving>
{
OFStreamSocket *_socket;
bool _chunked;
intmax_t _toRead;
bool _atEndOfStream, _setAtEndOfStream;
}
- (instancetype)initWithSocket: (OFStreamSocket *)sock
chunked: (bool)chunked
contentLength: (uintmax_t)contentLength;
@end
#ifdef OF_HAVE_THREADS
@interface OFHTTPServerThread: OFThread
- (void)stop;
@end
#endif
static OF_INLINE OFString *
normalizedKey(OFString *key)
| > > | 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 |
server: (OFHTTPServer *)server;
- (bool)parseProlog: (OFString *)line;
- (bool)parseHeaders: (OFString *)line;
- (bool)sendErrorAndClose: (short)statusCode;
- (void)createResponse;
@end
OF_DIRECT_MEMBERS
@interface OFHTTPServerRequestBodyStream: OFStream <OFReadyForReadingObserving>
{
OFStreamSocket *_socket;
bool _chunked;
intmax_t _toRead;
bool _atEndOfStream, _setAtEndOfStream;
}
- (instancetype)initWithSocket: (OFStreamSocket *)sock
chunked: (bool)chunked
contentLength: (uintmax_t)contentLength;
@end
#ifdef OF_HAVE_THREADS
OF_DIRECT_MEMBERS
@interface OFHTTPServerThread: OFThread
- (void)stop;
@end
#endif
static OF_INLINE OFString *
normalizedKey(OFString *key)
|
| ︙ | ︙ |
Modified src/OFINICategory+Private.h from [c23b5362fb] to [daec4f9da8].
| ︙ | ︙ | |||
18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 | #import "OFINICategory.h" #import "OFString.h" OF_ASSUME_NONNULL_BEGIN @class OFStream; @interface OFINICategory () - (instancetype)of_initWithName: (OFString *)name OF_METHOD_FAMILY(init); - (void)of_parseLine: (OFString *)line; - (bool)of_writeToStream: (OFStream *)stream encoding: (of_string_encoding_t)encoding first: (bool)first; @end OF_ASSUME_NONNULL_END | > | 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 | #import "OFINICategory.h" #import "OFString.h" OF_ASSUME_NONNULL_BEGIN @class OFStream; OF_DIRECT_MEMBERS @interface OFINICategory () - (instancetype)of_initWithName: (OFString *)name OF_METHOD_FAMILY(init); - (void)of_parseLine: (OFString *)line; - (bool)of_writeToStream: (OFStream *)stream encoding: (of_string_encoding_t)encoding first: (bool)first; @end OF_ASSUME_NONNULL_END |
Modified src/OFINICategory.m from [78d0c3480f] to [6f7f003a8d].
| ︙ | ︙ | |||
118 119 120 121 122 123 124 | [super dealloc]; } @end @implementation OFINICategory @synthesize name = _name; | | | 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 |
[super dealloc];
}
@end
@implementation OFINICategory
@synthesize name = _name;
- (instancetype)of_initWithName: (OFString *)name OF_DIRECT
{
self = [super init];
@try {
_name = [name copy];
_lines = [[OFMutableArray alloc] init];
} @catch (id e) {
|
| ︙ | ︙ |
Modified src/OFINIFile.m from [5e409bb0b6] to [e386265069].
| ︙ | ︙ | |||
25 26 27 28 29 30 31 32 33 34 35 36 37 38 | #import "OFFile.h" #import "OFINICategory.h" #import "OFINICategory+Private.h" #import "OFInvalidFormatException.h" #import "OFOpenItemFailedException.h" @interface OFINIFile () - (void)of_parseFile: (OFString *)path encoding: (of_string_encoding_t)encoding; @end static bool isWhitespaceLine(OFString *line) | > | 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 | #import "OFFile.h" #import "OFINICategory.h" #import "OFINICategory+Private.h" #import "OFInvalidFormatException.h" #import "OFOpenItemFailedException.h" OF_DIRECT_MEMBERS @interface OFINIFile () - (void)of_parseFile: (OFString *)path encoding: (of_string_encoding_t)encoding; @end static bool isWhitespaceLine(OFString *line) |
| ︙ | ︙ |
Modified src/OFINIFileSettings.m from [c14945381a] to [9d965e74da].
| ︙ | ︙ | |||
52 53 54 55 56 57 58 | [_INIFile release]; [super dealloc]; } - (void)of_getCategory: (OFString **)category andKey: (OFString **)key | | | 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 |
[_INIFile release];
[super dealloc];
}
- (void)of_getCategory: (OFString **)category
andKey: (OFString **)key
forPath: (OFString *)path OF_DIRECT
{
size_t pos = [path rangeOfString: @"."
options: OF_STRING_SEARCH_BACKWARDS].location;
if (pos == OF_NOT_FOUND) {
*category = @"";
*key = path;
|
| ︙ | ︙ |
Modified src/OFKernelEventObserver.m from [2c737f6572] to [58babda954].
| ︙ | ︙ | |||
217 218 219 220 221 222 223 |
bool foundInReadBuffer = false;
for (id object in _readObjects) {
void *pool = objc_autoreleasePoolPush();
if ([object isKindOfClass: [OFStream class]] &&
[object hasDataInReadBuffer] &&
| | | 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 |
bool foundInReadBuffer = false;
for (id object in _readObjects) {
void *pool = objc_autoreleasePoolPush();
if ([object isKindOfClass: [OFStream class]] &&
[object hasDataInReadBuffer] &&
![(OFStream *)object of_isWaitingForDelimiter]) {
if ([_delegate respondsToSelector:
@selector(objectIsReadyForReading:)])
[_delegate objectIsReadyForReading: object];
foundInReadBuffer = true;
}
|
| ︙ | ︙ |
Modified src/OFLHAArchive.m from [a8a54167d4] to [493061fab4].
| ︙ | ︙ | |||
34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 |
#import "OFInvalidArgumentException.h"
#import "OFNotImplementedException.h"
#import "OFNotOpenException.h"
#import "OFOutOfRangeException.h"
#import "OFTruncatedDataException.h"
#import "OFWriteFailedException.h"
@interface OFLHAArchiveFileReadStream: OFStream <OFReadyForReadingObserving>
{
OFStream *_stream, *_decompressedStream;
OFLHAArchiveEntry *_entry;
uint32_t _toRead, _bytesConsumed;
uint16_t _CRC16;
bool _atEndOfStream, _skipped;
}
- (instancetype)of_initWithStream: (OFStream *)stream
entry: (OFLHAArchiveEntry *)entry;
- (void)of_skip;
@end
@interface OFLHAArchiveFileWriteStream: OFStream <OFReadyForWritingObserving>
{
OFMutableLHAArchiveEntry *_entry;
of_string_encoding_t _encoding;
OFSeekableStream *_stream;
of_offset_t _headerOffset;
uint32_t _bytesWritten;
| > > | 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 |
#import "OFInvalidArgumentException.h"
#import "OFNotImplementedException.h"
#import "OFNotOpenException.h"
#import "OFOutOfRangeException.h"
#import "OFTruncatedDataException.h"
#import "OFWriteFailedException.h"
OF_DIRECT_MEMBERS
@interface OFLHAArchiveFileReadStream: OFStream <OFReadyForReadingObserving>
{
OFStream *_stream, *_decompressedStream;
OFLHAArchiveEntry *_entry;
uint32_t _toRead, _bytesConsumed;
uint16_t _CRC16;
bool _atEndOfStream, _skipped;
}
- (instancetype)of_initWithStream: (OFStream *)stream
entry: (OFLHAArchiveEntry *)entry;
- (void)of_skip;
@end
OF_DIRECT_MEMBERS
@interface OFLHAArchiveFileWriteStream: OFStream <OFReadyForWritingObserving>
{
OFMutableLHAArchiveEntry *_entry;
of_string_encoding_t _encoding;
OFSeekableStream *_stream;
of_offset_t _headerOffset;
uint32_t _bytesWritten;
|
| ︙ | ︙ |
Modified src/OFLHAArchiveEntry+Private.h from [4be7606365] to [085a1438c0].
| ︙ | ︙ | |||
15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 |
* file.
*/
#import "OFLHAArchive.h"
OF_ASSUME_NONNULL_BEGIN
@interface OFLHAArchiveEntry ()
- (instancetype)of_initWithHeader: (char [_Nonnull 21])header
stream: (OFStream *)stream
encoding: (of_string_encoding_t)encoding
OF_METHOD_FAMILY(init);
- (void)of_writeToStream: (OFStream *)stream
encoding: (of_string_encoding_t)encoding;
@end
OF_ASSUME_NONNULL_END
| > | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 |
* file.
*/
#import "OFLHAArchive.h"
OF_ASSUME_NONNULL_BEGIN
OF_DIRECT_MEMBERS
@interface OFLHAArchiveEntry ()
- (instancetype)of_initWithHeader: (char [_Nonnull 21])header
stream: (OFStream *)stream
encoding: (of_string_encoding_t)encoding
OF_METHOD_FAMILY(init);
- (void)of_writeToStream: (OFStream *)stream
encoding: (of_string_encoding_t)encoding;
@end
OF_ASSUME_NONNULL_END
|
Modified src/OFLHADecompressingStream.h from [83e1abd175] to [cc62626ce1].
| ︙ | ︙ | |||
17 18 19 20 21 22 23 24 25 26 27 28 29 30 |
#import "OFStream.h"
OF_ASSUME_NONNULL_BEGIN
#define OF_LHA_DECOMPRESSING_STREAM_BUFFER_SIZE 4096
@interface OFLHADecompressingStream: OFStream
{
OFStream *_stream;
uint8_t _distanceBits, _dictionaryBits;
unsigned char _buffer[OF_LHA_DECOMPRESSING_STREAM_BUFFER_SIZE];
uint32_t _bytesConsumed;
uint16_t _bufferIndex, _bufferLength;
| > | 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 |
#import "OFStream.h"
OF_ASSUME_NONNULL_BEGIN
#define OF_LHA_DECOMPRESSING_STREAM_BUFFER_SIZE 4096
OF_DIRECT_MEMBERS
@interface OFLHADecompressingStream: OFStream
{
OFStream *_stream;
uint8_t _distanceBits, _dictionaryBits;
unsigned char _buffer[OF_LHA_DECOMPRESSING_STREAM_BUFFER_SIZE];
uint32_t _bytesConsumed;
uint16_t _bufferIndex, _bufferLength;
|
| ︙ | ︙ |
Modified src/OFList.m from [8f702bf74a] to [58e8774a64].
| ︙ | ︙ | |||
24 25 26 27 28 29 30 31 32 33 34 35 36 37 |
#import "OFString.h"
#import "OFXMLElement.h"
#import "OFArray.h"
#import "OFEnumerationMutationException.h"
#import "OFInvalidArgumentException.h"
@interface OFListEnumerator: OFEnumerator
{
OFList *_list;
of_list_object_t *_Nullable _current;
unsigned long _mutations;
unsigned long *_Nullable _mutationsPtr;
}
| > | 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 |
#import "OFString.h"
#import "OFXMLElement.h"
#import "OFArray.h"
#import "OFEnumerationMutationException.h"
#import "OFInvalidArgumentException.h"
OF_DIRECT_MEMBERS
@interface OFListEnumerator: OFEnumerator
{
OFList *_list;
of_list_object_t *_Nullable _current;
unsigned long _mutations;
unsigned long *_Nullable _mutationsPtr;
}
|
| ︙ | ︙ |
Modified src/OFMD5Hash.m from [4a0afb099d] to [f7acc8c4b8].
| ︙ | ︙ | |||
24 25 26 27 28 29 30 31 32 33 34 35 36 37 | #import "OFHashAlreadyCalculatedException.h" #import "OFOutOfRangeException.h" #define DIGEST_SIZE 16 #define BLOCK_SIZE 64 @interface OFMD5Hash () - (void)of_resetState; @end #define F(a, b, c) (((a) & (b)) | (~(a) & (c))) #define G(a, b, c) (((a) & (c)) | ((b) & ~(c))) #define H(a, b, c) ((a) ^ (b) ^ (c)) | > | 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 | #import "OFHashAlreadyCalculatedException.h" #import "OFOutOfRangeException.h" #define DIGEST_SIZE 16 #define BLOCK_SIZE 64 OF_DIRECT_MEMBERS @interface OFMD5Hash () - (void)of_resetState; @end #define F(a, b, c) (((a) & (b)) | (~(a) & (c))) #define G(a, b, c) (((a) & (c)) | ((b) & ~(c))) #define H(a, b, c) ((a) ^ (b) ^ (c)) |
| ︙ | ︙ |
Modified src/OFMapTable+Private.h from [fcec305650] to [1364bfeb16].
| ︙ | ︙ | |||
15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 |
* file.
*/
#import "OFMapTable.h"
OF_ASSUME_NONNULL_BEGIN
@interface OFMapTableEnumeratorWrapper: OFEnumerator
{
OFMapTableEnumerator *_enumerator;
id _object;
}
- (instancetype)initWithEnumerator: (OFMapTableEnumerator *)enumerator
object: (id)object;
@end
OF_ASSUME_NONNULL_END
| > | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 |
* file.
*/
#import "OFMapTable.h"
OF_ASSUME_NONNULL_BEGIN
OF_DIRECT_MEMBERS
@interface OFMapTableEnumeratorWrapper: OFEnumerator
{
OFMapTableEnumerator *_enumerator;
id _object;
}
- (instancetype)initWithEnumerator: (OFMapTableEnumerator *)enumerator
object: (id)object;
@end
OF_ASSUME_NONNULL_END
|
Modified src/OFMapTable.m from [df5b78cbf7] to [8ca8ae429a].
| ︙ | ︙ | |||
57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 |
static bool
defaultEqual(void *object1, void *object2)
{
return (object1 == object2);
}
@interface OFMapTable ()
- (void)of_setObject: (void *)object
forKey: (void *)key
hash: (uint32_t)hash;
@end
@interface OFMapTableEnumerator ()
- (instancetype)of_initWithMapTable: (OFMapTable *)mapTable
buckets: (struct of_map_table_bucket **)buckets
capacity: (uint32_t)capacity
mutationsPointer: (unsigned long *)mutationsPtr
OF_METHOD_FAMILY(init);
@end
| > > | 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 |
static bool
defaultEqual(void *object1, void *object2)
{
return (object1 == object2);
}
OF_DIRECT_MEMBERS
@interface OFMapTable ()
- (void)of_setObject: (void *)object
forKey: (void *)key
hash: (uint32_t)hash;
@end
OF_DIRECT_MEMBERS
@interface OFMapTableEnumerator ()
- (instancetype)of_initWithMapTable: (OFMapTable *)mapTable
buckets: (struct of_map_table_bucket **)buckets
capacity: (uint32_t)capacity
mutationsPointer: (unsigned long *)mutationsPtr
OF_METHOD_FAMILY(init);
@end
|
| ︙ | ︙ | |||
289 290 291 292 293 294 295 | if (_keyFunctions.equal(_buckets[i]->key, key)) return _buckets[i]->object; } return NULL; } | | | 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 |
if (_keyFunctions.equal(_buckets[i]->key, key))
return _buckets[i]->object;
}
return NULL;
}
- (void)of_resizeForCount: (uint32_t)count OF_DIRECT
{
uint32_t fullness, capacity;
struct of_map_table_bucket **buckets;
if (count > UINT32_MAX / sizeof(*_buckets) || count > UINT32_MAX / 8)
@throw [OFOutOfRangeException exception];
|
| ︙ | ︙ |
Modified src/OFMutableAdjacentArray.m from [1107dc450e] to [1999b771ee].
| ︙ | ︙ | |||
324 325 326 327 328 329 330 | return ret; } if (state->state >= count) return 0; state->state = (unsigned long)count; | | | 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 |
return ret;
}
if (state->state >= count)
return 0;
state->state = (unsigned long)count;
state->itemsPtr = (id *)_array.items;
state->mutationsPtr = &_mutations;
return (int)count;
}
- (OFEnumerator *)objectEnumerator
{
|
| ︙ | ︙ |
Modified src/OFMutableString.m from [3e022bac69] to [bb86d6b9da].
| ︙ | ︙ | |||
231 232 233 234 235 236 237 | return [super alloc]; } #ifdef OF_HAVE_UNICODE_TABLES - (void)of_convertWithWordStartTable: (const of_unichar_t *const [])startTable wordMiddleTable: (const of_unichar_t *const [])middleTable wordStartTableSize: (size_t)startTableSize | | | 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 |
return [super alloc];
}
#ifdef OF_HAVE_UNICODE_TABLES
- (void)of_convertWithWordStartTable: (const of_unichar_t *const [])startTable
wordMiddleTable: (const of_unichar_t *const [])middleTable
wordStartTableSize: (size_t)startTableSize
wordMiddleTableSize: (size_t)middleTableSize OF_DIRECT
{
void *pool = objc_autoreleasePoolPush();
const of_unichar_t *characters = self.characters;
size_t length = self.length;
bool isStart = true;
for (size_t i = 0; i < length; i++) {
|
| ︙ | ︙ | |||
263 264 265 266 267 268 269 270 271 272 273 274 275 276 |
}
objc_autoreleasePoolPop(pool);
}
#else
- (void)of_convertWithWordStartFunction: (char (*)(char))startFunction
wordMiddleFunction: (char (*)(char))middleFunction
{
void *pool = objc_autoreleasePoolPush();
const of_unichar_t *characters = self.characters;
size_t length = self.length;
bool isStart = true;
for (size_t i = 0; i < length; i++) {
| > | 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 |
}
objc_autoreleasePoolPop(pool);
}
#else
- (void)of_convertWithWordStartFunction: (char (*)(char))startFunction
wordMiddleFunction: (char (*)(char))middleFunction
OF_DIRECT
{
void *pool = objc_autoreleasePoolPush();
const of_unichar_t *characters = self.characters;
size_t length = self.length;
bool isStart = true;
for (size_t i = 0; i < length; i++) {
|
| ︙ | ︙ |
Modified src/OFMutableUTF8String.m from [88e7b0c06e] to [cb57991be9].
| ︙ | ︙ | |||
69 70 71 72 73 74 75 | return self; } - (void)of_convertWithWordStartTable: (const of_unichar_t *const[])startTable wordMiddleTable: (const of_unichar_t *const[])middleTable wordStartTableSize: (size_t)startTableSize | | | 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 |
return self;
}
- (void)of_convertWithWordStartTable: (const of_unichar_t *const[])startTable
wordMiddleTable: (const of_unichar_t *const[])middleTable
wordStartTableSize: (size_t)startTableSize
wordMiddleTableSize: (size_t)middleTableSize OF_DIRECT
{
of_unichar_t *unicodeString;
size_t unicodeLen, newCStringLength;
size_t i, j;
char *newCString;
bool isStart = true;
|
| ︙ | ︙ |
Modified src/OFPollKernelEventObserver.m from [49ee878680] to [5ca69d7bfc].
| ︙ | ︙ | |||
67 68 69 70 71 72 73 |
[_FDs release];
[super dealloc];
}
- (void)of_addObject: (id)object
fileDescriptor: (int)fd
| | | 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 |
[_FDs release];
[super dealloc];
}
- (void)of_addObject: (id)object
fileDescriptor: (int)fd
events: (short)events OF_DIRECT
{
struct pollfd *FDs;
size_t count;
bool found;
if (fd < 0)
@throw [OFObserveFailedException exceptionWithObserver: self
|
| ︙ | ︙ | |||
106 107 108 109 110 111 112 | _FDToObject[fd] = object; [_FDs addItem: &p]; } } - (void)of_removeObject: (id)object fileDescriptor: (int)fd | | | 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 |
_FDToObject[fd] = object;
[_FDs addItem: &p];
}
}
- (void)of_removeObject: (id)object
fileDescriptor: (int)fd
events: (short)events OF_DIRECT
{
struct pollfd *FDs;
size_t nFDs;
if (fd < 0)
@throw [OFObserveFailedException exceptionWithObserver: self
errNo: EBADF];
|
| ︙ | ︙ |
Modified src/OFRIPEMD160Hash.m from [cf17c7c508] to [f5c31d29f5].
| ︙ | ︙ | |||
24 25 26 27 28 29 30 31 32 33 34 35 36 37 | #import "OFHashAlreadyCalculatedException.h" #import "OFOutOfRangeException.h" #define DIGEST_SIZE 20 #define BLOCK_SIZE 64 @interface OFRIPEMD160Hash () - (void)of_resetState; @end #define F(a, b, c) ((a) ^ (b) ^ (c)) #define G(a, b, c) (((a) & (b)) | (~(a) & (c))) #define H(a, b, c) (((a) | ~(b)) ^ (c)) | > | 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 | #import "OFHashAlreadyCalculatedException.h" #import "OFOutOfRangeException.h" #define DIGEST_SIZE 20 #define BLOCK_SIZE 64 OF_DIRECT_MEMBERS @interface OFRIPEMD160Hash () - (void)of_resetState; @end #define F(a, b, c) ((a) ^ (b) ^ (c)) #define G(a, b, c) (((a) & (b)) | (~(a) & (c))) #define H(a, b, c) (((a) | ~(b)) ^ (c)) |
| ︙ | ︙ |
Modified src/OFRunLoop+Private.h from [f46c29fa91] to [979d7c9f7e].
| ︙ | ︙ | |||
29 30 31 32 33 34 35 36 37 38 39 40 41 42 | @protocol OFRunLoopConnectDelegate <OFObject> - (void)of_socketDidConnect: (id)socket exception: (nullable id)exception; - (id)of_connectionFailedExceptionForErrNo: (int)errNo; @end #endif @interface OFRunLoop () + (void)of_setMainRunLoop: (OFRunLoop *)runLoop; #ifdef OF_HAVE_SOCKETS + (void)of_addAsyncReadForStream: (OFStream <OFReadyForReadingObserving> *) stream buffer: (void *)buffer length: (size_t)length | > | 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 | @protocol OFRunLoopConnectDelegate <OFObject> - (void)of_socketDidConnect: (id)socket exception: (nullable id)exception; - (id)of_connectionFailedExceptionForErrNo: (int)errNo; @end #endif OF_DIRECT_MEMBERS @interface OFRunLoop () + (void)of_setMainRunLoop: (OFRunLoop *)runLoop; #ifdef OF_HAVE_SOCKETS + (void)of_addAsyncReadForStream: (OFStream <OFReadyForReadingObserving> *) stream buffer: (void *)buffer length: (size_t)length |
| ︙ | ︙ |
Modified src/OFRunLoop.h from [d9a3da87f2] to [b5257ff2c7].
| ︙ | ︙ | |||
45 46 47 48 49 50 51 |
#ifdef __cplusplus
extern "C" {
#endif
/*!
* @brief The default mode for an OFRunLoop.
*/
| | | 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 |
#ifdef __cplusplus
extern "C" {
#endif
/*!
* @brief The default mode for an OFRunLoop.
*/
extern const of_run_loop_mode_t of_run_loop_mode_default;
#ifdef __cplusplus
}
#endif
/*!
* @class OFRunLoop OFRunLoop.h ObjFW/OFRunLoop.h
*
|
| ︙ | ︙ |
Modified src/OFRunLoop.m from [8701d2b9f0] to [ae4dcb6d52].
| ︙ | ︙ | |||
41 42 43 44 45 46 47 | #import "OFSortedList.h" #import "OFTimer.h" #import "OFTimer+Private.h" #import "OFDate.h" #import "OFObserveFailedException.h" | | | 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 |
#import "OFSortedList.h"
#import "OFTimer.h"
#import "OFTimer+Private.h"
#import "OFDate.h"
#import "OFObserveFailedException.h"
const of_run_loop_mode_t of_run_loop_mode_default = @"of_run_loop_mode_default";
static OFRunLoop *mainRunLoop = nil;
@interface OFRunLoopState: OFObject
#ifdef OF_HAVE_SOCKETS
<OFKernelEventObserverDelegate>
#endif
{
|
| ︙ | ︙ | |||
74 75 76 77 78 79 80 81 82 83 84 85 86 87 | # ifdef OF_HAVE_THREADS OFMutex *_execSignalsMutex; # endif #endif } @end @interface OFRunLoop () - (OFRunLoopState *)of_stateForMode: (of_run_loop_mode_t)mode create: (bool)create; @end #ifdef OF_HAVE_SOCKETS @interface OFRunLoopQueueItem: OFObject | > | 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 | # ifdef OF_HAVE_THREADS OFMutex *_execSignalsMutex; # endif #endif } @end OF_DIRECT_MEMBERS @interface OFRunLoop () - (OFRunLoopState *)of_stateForMode: (of_run_loop_mode_t)mode create: (bool)create; @end #ifdef OF_HAVE_SOCKETS @interface OFRunLoopQueueItem: OFObject |
| ︙ | ︙ |
Modified src/OFSHA1Hash.m from [744ef1090a] to [cfb97974cb].
| ︙ | ︙ | |||
24 25 26 27 28 29 30 31 32 33 34 35 36 37 | #import "OFHashAlreadyCalculatedException.h" #import "OFOutOfRangeException.h" #define DIGEST_SIZE 20 #define BLOCK_SIZE 64 @interface OFSHA1Hash () - (void)of_resetState; @end #define F(a, b, c, d) ((d) ^ ((b) & ((c) ^ (d)))) #define G(a, b, c, d) ((b) ^ (c) ^ (d)) #define H(a, b, c, d) (((b) & (c)) | ((d) & ((b) | (c)))) | > | 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 | #import "OFHashAlreadyCalculatedException.h" #import "OFOutOfRangeException.h" #define DIGEST_SIZE 20 #define BLOCK_SIZE 64 OF_DIRECT_MEMBERS @interface OFSHA1Hash () - (void)of_resetState; @end #define F(a, b, c, d) ((d) ^ ((b) & ((c) ^ (d)))) #define G(a, b, c, d) ((b) ^ (c) ^ (d)) #define H(a, b, c, d) (((b) & (c)) | ((d) & ((b) | (c)))) |
| ︙ | ︙ |
Modified src/OFSPXSocket.m from [9940cead8b] to [c3e334ddfc].
| ︙ | ︙ | |||
41 42 43 44 45 46 47 48 49 50 51 52 53 54 |
- (int)of_createSocketForAddress: (const of_socket_address_t *)address
errNo: (int *)errNo;
- (bool)of_connectSocketToAddress: (const of_socket_address_t *)address
errNo: (int *)errNo;
- (void)of_closeSocket;
@end
@interface OFSPXSocketAsyncConnectDelegate: OFObject <OFRunLoopConnectDelegate>
{
OFSPXSocket *_socket;
unsigned char _node[IPX_NODE_LEN];
uint32_t _network;
uint16_t _port;
#ifdef OF_HAVE_BLOCKS
| > | 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 |
- (int)of_createSocketForAddress: (const of_socket_address_t *)address
errNo: (int *)errNo;
- (bool)of_connectSocketToAddress: (const of_socket_address_t *)address
errNo: (int *)errNo;
- (void)of_closeSocket;
@end
OF_DIRECT_MEMBERS
@interface OFSPXSocketAsyncConnectDelegate: OFObject <OFRunLoopConnectDelegate>
{
OFSPXSocket *_socket;
unsigned char _node[IPX_NODE_LEN];
uint32_t _network;
uint16_t _port;
#ifdef OF_HAVE_BLOCKS
|
| ︙ | ︙ |
Modified src/OFSPXStreamSocket.m from [cb1a9316c7] to [fcd6269f1f].
| ︙ | ︙ | |||
41 42 43 44 45 46 47 48 49 50 51 52 53 54 |
- (int)of_createSocketForAddress: (const of_socket_address_t *)address
errNo: (int *)errNo;
- (bool)of_connectSocketToAddress: (const of_socket_address_t *)address
errNo: (int *)errNo;
- (void)of_closeSocket;
@end
@interface OFSPXStreamSocketAsyncConnectDelegate: OFObject
<OFRunLoopConnectDelegate>
{
OFSPXStreamSocket *_socket;
unsigned char _node[IPX_NODE_LEN];
uint32_t _network;
uint16_t _port;
| > | 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 |
- (int)of_createSocketForAddress: (const of_socket_address_t *)address
errNo: (int *)errNo;
- (bool)of_connectSocketToAddress: (const of_socket_address_t *)address
errNo: (int *)errNo;
- (void)of_closeSocket;
@end
OF_DIRECT_MEMBERS
@interface OFSPXStreamSocketAsyncConnectDelegate: OFObject
<OFRunLoopConnectDelegate>
{
OFSPXStreamSocket *_socket;
unsigned char _node[IPX_NODE_LEN];
uint32_t _network;
uint16_t _port;
|
| ︙ | ︙ |
Modified src/OFSelectKernelEventObserver.m from [7a4ddf3e07] to [f86117a30a].
| ︙ | ︙ | |||
224 225 226 227 228 229 230 | Permit(); #else events = select(_maxFD + 1, &readFDs, &writeFDs, NULL, (timeInterval != -1 ? &timeout : NULL)); #endif if (events < 0) | | > | | 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 |
Permit();
#else
events = select(_maxFD + 1, &readFDs, &writeFDs, NULL,
(timeInterval != -1 ? &timeout : NULL));
#endif
if (events < 0)
@throw [OFObserveFailedException
exceptionWithObserver: self
errNo: of_socket_errno()];
#ifdef OF_AMIGAOS
if (execSignalMask != 0 &&
[_delegate respondsToSelector: @selector(execSignalWasReceived:)])
[_delegate execSignalWasReceived: execSignalMask];
#else
if (FD_ISSET(_cancelFD[0], &readFDs)) {
|
| ︙ | ︙ |
Modified src/OFStdIOStream+Private.h from [f49b4a7fef] to [c5d65c7b40].
| ︙ | ︙ | |||
15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 | * file. */ #import "OFStdIOStream.h" OF_ASSUME_NONNULL_BEGIN @interface OFStdIOStream () #ifndef OF_AMIGAOS - (instancetype)of_initWithFileDescriptor: (int)fd OF_METHOD_FAMILY(init); #else - (instancetype)of_initWithHandle: (BPTR)handle closable: (bool)closable OF_METHOD_FAMILY(init); #endif @end OF_ASSUME_NONNULL_END | > | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 | * file. */ #import "OFStdIOStream.h" OF_ASSUME_NONNULL_BEGIN OF_DIRECT_MEMBERS @interface OFStdIOStream () #ifndef OF_AMIGAOS - (instancetype)of_initWithFileDescriptor: (int)fd OF_METHOD_FAMILY(init); #else - (instancetype)of_initWithHandle: (BPTR)handle closable: (bool)closable OF_METHOD_FAMILY(init); #endif @end OF_ASSUME_NONNULL_END |
Modified src/OFStdIOStream.m from [26a72da19c] to [10bbd8e570].
| ︙ | ︙ | |||
39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 |
#import "OFInitializationFailedException.h"
#import "OFInvalidArgumentException.h"
#import "OFNotOpenException.h"
#import "OFOutOfRangeException.h"
#import "OFReadFailedException.h"
#import "OFWriteFailedException.h"
#ifdef OF_AMIGAOS
# include <proto/exec.h>
# include <proto/dos.h>
#endif
/* References for static linking */
#ifdef OF_WINDOWS
void
_reference_to_OFWin32ConsoleStdIOStream(void)
{
| > > > > > | 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 |
#import "OFInitializationFailedException.h"
#import "OFInvalidArgumentException.h"
#import "OFNotOpenException.h"
#import "OFOutOfRangeException.h"
#import "OFReadFailedException.h"
#import "OFWriteFailedException.h"
#ifdef OF_IOS
# undef HAVE_ISATTY
#endif
#ifdef OF_AMIGAOS
# include <proto/exec.h>
# include <proto/dos.h>
# undef HAVE_ISATTY
#endif
/* References for static linking */
#ifdef OF_WINDOWS
void
_reference_to_OFWin32ConsoleStdIOStream(void)
{
|
| ︙ | ︙ | |||
94 95 96 97 98 99 100 | [of_stderr writeFormat: @"[%@.%03d %@(%d)] %@\n", dateString, date.microsecond / 1000, me, getpid(), msg]; objc_autoreleasePoolPop(pool); } | | | 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 |
[of_stderr writeFormat: @"[%@.%03d %@(%d)] %@\n", dateString,
date.microsecond / 1000, me, getpid(), msg];
objc_autoreleasePoolPop(pool);
}
#ifdef HAVE_ISATTY
static int
colorToANSI(OFColor *color)
{
if ([color isEqual: [OFColor black]])
return 30;
if ([color isEqual: [OFColor maroon]])
return 31;
|
| ︙ | ︙ | |||
384 385 386 387 388 389 390 |
- (unsigned int)retainCount
{
return OF_RETAIN_COUNT_MAX;
}
- (bool)hasTerminal
{
| | | 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 |
- (unsigned int)retainCount
{
return OF_RETAIN_COUNT_MAX;
}
- (bool)hasTerminal
{
#ifdef HAVE_ISATTY
return isatty(_fd);
#else
return false;
#endif
}
- (int)columns
|
| ︙ | ︙ | |||
421 422 423 424 425 426 427 |
#else
return -1;
#endif
}
- (void)setForegroundColor: (OFColor *)color
{
| | | | | | | | | | 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 |
#else
return -1;
#endif
}
- (void)setForegroundColor: (OFColor *)color
{
#ifdef HAVE_ISATTY
int code;
if (!isatty(_fd))
return;
if ((code = colorToANSI(color)) == -1)
return;
[self writeFormat: @"\033[%um", code];
#endif
}
- (void)setBackgroundColor: (OFColor *)color
{
#ifdef HAVE_ISATTY
int code;
if (!isatty(_fd))
return;
if ((code = colorToANSI(color)) == -1)
return;
[self writeFormat: @"\033[%um", code + 10];
#endif
}
- (void)reset
{
#ifdef HAVE_ISATTY
if (!isatty(_fd))
return;
[self writeString: @"\033[0m"];
#endif
}
- (void)clear
{
#ifdef HAVE_ISATTY
if (!isatty(_fd))
return;
[self writeString: @"\033[2J"];
#endif
}
- (void)eraseLine
{
#ifdef HAVE_ISATTY
if (!isatty(_fd))
return;
[self writeString: @"\033[2K"];
#endif
}
- (void)setCursorColumn: (unsigned int)column
{
#ifdef HAVE_ISATTY
if (!isatty(_fd))
return;
[self writeFormat: @"\033[%uG", column + 1];
#endif
}
- (void)setCursorPosition: (of_point_t)position
{
if (position.x < 0 || position.y < 0)
@throw [OFInvalidArgumentException exception];
#ifdef HAVE_ISATTY
if (!isatty(_fd))
return;
[self writeFormat: @"\033[%u;%uH",
(unsigned)position.y + 1, (unsigned)position.x + 1];
#endif
}
- (void)setRelativeCursorPosition: (of_point_t)position
{
#ifdef HAVE_ISATTY
if (!isatty(_fd))
return;
if (position.x > 0)
[self writeFormat: @"\033[%uC", (unsigned)position.x];
else if (position.x < 0)
[self writeFormat: @"\033[%uD", (unsigned)-position.x];
|
| ︙ | ︙ |
Modified src/OFStream+Private.h from [81ef70d19a] to [55a5b86424].
| ︙ | ︙ | |||
15 16 17 18 19 20 21 22 23 24 25 26 27 |
* file.
*/
#import "OFStream.h"
OF_ASSUME_NONNULL_BEGIN
@interface OFStream ()
@property (readonly, nonatomic, getter=of_isWaitingForDelimiter)
bool of_waitingForDelimiter;
@end
OF_ASSUME_NONNULL_END
| > | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 |
* file.
*/
#import "OFStream.h"
OF_ASSUME_NONNULL_BEGIN
OF_DIRECT_MEMBERS
@interface OFStream ()
@property (readonly, nonatomic, getter=of_isWaitingForDelimiter)
bool of_waitingForDelimiter;
@end
OF_ASSUME_NONNULL_END
|
Modified src/OFString.m from [9bf92ef7e1] to [e1b9c425c7].
| ︙ | ︙ | |||
84 85 86 87 88 89 90 | static locale_t cLocale; #endif @interface OFString () - (size_t)of_getCString: (char *)cString maxLength: (size_t)maxLength encoding: (of_string_encoding_t)encoding | | | | 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 | static locale_t cLocale; #endif @interface OFString () - (size_t)of_getCString: (char *)cString maxLength: (size_t)maxLength encoding: (of_string_encoding_t)encoding lossy: (bool)lossy OF_DIRECT; - (const char *)of_cStringWithEncoding: (of_string_encoding_t)encoding lossy: (bool)lossy OF_DIRECT; - (OFString *)of_JSONRepresentationWithOptions: (int)options depth: (size_t)depth; @end @interface OFStringPlaceholder: OFString @end |
| ︙ | ︙ | |||
372 373 374 375 376 377 378 |
- (instancetype)init
{
return (id)[[OFUTF8String alloc] init];
}
- (instancetype)initWithUTF8String: (const char *)UTF8String
{
| | | | 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 |
- (instancetype)init
{
return (id)[[OFUTF8String alloc] init];
}
- (instancetype)initWithUTF8String: (const char *)UTF8String
{
OFUTF8String *string;
size_t length;
void *storage;
length = strlen(UTF8String);
string = of_alloc_object([OFUTF8String class], length + 1, 1, &storage);
return (id)[string of_initWithUTF8String: UTF8String
length: length
storage: storage];
}
- (instancetype)initWithUTF8String: (const char *)UTF8String
length: (size_t)UTF8StringLength
{
OFUTF8String *string;
void *storage;
string = of_alloc_object([OFUTF8String class], UTF8StringLength + 1, 1,
&storage);
return (id)[string of_initWithUTF8String: UTF8String
length: UTF8StringLength
|
| ︙ | ︙ | |||
420 421 422 423 424 425 426 |
freeWhenDone: freeWhenDone];
}
- (instancetype)initWithCString: (const char *)cString
encoding: (of_string_encoding_t)encoding
{
if (encoding == OF_STRING_ENCODING_UTF_8) {
| | | 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 |
freeWhenDone: freeWhenDone];
}
- (instancetype)initWithCString: (const char *)cString
encoding: (of_string_encoding_t)encoding
{
if (encoding == OF_STRING_ENCODING_UTF_8) {
OFUTF8String *string;
size_t length;
void *storage;
length = strlen(cString);
string = of_alloc_object([OFUTF8String class], length + 1, 1,
&storage);
|
| ︙ | ︙ | |||
442 443 444 445 446 447 448 |
}
- (instancetype)initWithCString: (const char *)cString
encoding: (of_string_encoding_t)encoding
length: (size_t)cStringLength
{
if (encoding == OF_STRING_ENCODING_UTF_8) {
| | | 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 |
}
- (instancetype)initWithCString: (const char *)cString
encoding: (of_string_encoding_t)encoding
length: (size_t)cStringLength
{
if (encoding == OF_STRING_ENCODING_UTF_8) {
OFUTF8String *string;
void *storage;
string = of_alloc_object([OFUTF8String class],
cStringLength + 1, 1, &storage);
return (id)[string of_initWithUTF8String: cString
length: cStringLength
|
| ︙ | ︙ |
Modified src/OFTarArchive.m from [74012ab28d] to [22d3bc898d].
| ︙ | ︙ | |||
30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 |
#import "OFInvalidArgumentException.h"
#import "OFInvalidFormatException.h"
#import "OFNotOpenException.h"
#import "OFOutOfRangeException.h"
#import "OFTruncatedDataException.h"
#import "OFWriteFailedException.h"
@interface OFTarArchiveFileReadStream: OFStream <OFReadyForReadingObserving>
{
OFTarArchiveEntry *_entry;
OFStream *_stream;
uint64_t _toRead;
bool _atEndOfStream, _skipped;
}
- (instancetype)of_initWithStream: (OFStream *)stream
entry: (OFTarArchiveEntry *)entry;
- (void)of_skip;
@end
@interface OFTarArchiveFileWriteStream: OFStream <OFReadyForWritingObserving>
{
OFTarArchiveEntry *_entry;
OFStream *_stream;
uint64_t _toWrite;
}
| > > | 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 |
#import "OFInvalidArgumentException.h"
#import "OFInvalidFormatException.h"
#import "OFNotOpenException.h"
#import "OFOutOfRangeException.h"
#import "OFTruncatedDataException.h"
#import "OFWriteFailedException.h"
OF_DIRECT_MEMBERS
@interface OFTarArchiveFileReadStream: OFStream <OFReadyForReadingObserving>
{
OFTarArchiveEntry *_entry;
OFStream *_stream;
uint64_t _toRead;
bool _atEndOfStream, _skipped;
}
- (instancetype)of_initWithStream: (OFStream *)stream
entry: (OFTarArchiveEntry *)entry;
- (void)of_skip;
@end
OF_DIRECT_MEMBERS
@interface OFTarArchiveFileWriteStream: OFStream <OFReadyForWritingObserving>
{
OFTarArchiveEntry *_entry;
OFStream *_stream;
uint64_t _toWrite;
}
|
| ︙ | ︙ |
Modified src/OFTarArchiveEntry+Private.h from [b3f653d2b2] to [13ddd96cdf].
| ︙ | ︙ | |||
18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 |
#import "OFTarArchiveEntry.h"
#import "OFString.h"
OF_ASSUME_NONNULL_BEGIN
@class OFStream;
@interface OFTarArchiveEntry ()
- (instancetype)of_initWithHeader: (unsigned char [_Nonnull 512])header
encoding: (of_string_encoding_t)encoding
OF_METHOD_FAMILY(init);
- (void)of_writeToStream: (OFStream *)stream
encoding: (of_string_encoding_t)encoding;
@end
OF_ASSUME_NONNULL_END
| > | 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 |
#import "OFTarArchiveEntry.h"
#import "OFString.h"
OF_ASSUME_NONNULL_BEGIN
@class OFStream;
OF_DIRECT_MEMBERS
@interface OFTarArchiveEntry ()
- (instancetype)of_initWithHeader: (unsigned char [_Nonnull 512])header
encoding: (of_string_encoding_t)encoding
OF_METHOD_FAMILY(init);
- (void)of_writeToStream: (OFStream *)stream
encoding: (of_string_encoding_t)encoding;
@end
OF_ASSUME_NONNULL_END
|
Modified src/OFThread+Private.h from [5617fb7048] to [5ab3745dfa].
| ︙ | ︙ | |||
16 17 18 19 20 21 22 23 24 25 26 27 28 | */ #import "OFThread.h" OF_ASSUME_NONNULL_BEGIN #ifdef OF_HAVE_THREADS @interface OFThread () + (void)of_createMainThread; @end #endif OF_ASSUME_NONNULL_END | > | 16 17 18 19 20 21 22 23 24 25 26 27 28 29 | */ #import "OFThread.h" OF_ASSUME_NONNULL_BEGIN #ifdef OF_HAVE_THREADS OF_DIRECT_MEMBERS @interface OFThread () + (void)of_createMainThread; @end #endif OF_ASSUME_NONNULL_END |
Modified src/OFTimer+Private.h from [89cdf956f3] to [3bdcab087f].
| ︙ | ︙ | |||
15 16 17 18 19 20 21 22 23 24 25 26 27 | * file. */ #import "OFTimer.h" OF_ASSUME_NONNULL_BEGIN @interface OFTimer () - (void)of_setInRunLoop: (nullable OFRunLoop *)runLoop mode: (nullable of_run_loop_mode_t)mode; @end OF_ASSUME_NONNULL_END | > | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | * file. */ #import "OFTimer.h" OF_ASSUME_NONNULL_BEGIN OF_DIRECT_MEMBERS @interface OFTimer () - (void)of_setInRunLoop: (nullable OFRunLoop *)runLoop mode: (nullable of_run_loop_mode_t)mode; @end OF_ASSUME_NONNULL_END |
Modified src/OFTimer.m from [51ddf396b5] to [ced46435b5].
| ︙ | ︙ | |||
325 326 327 328 329 330 331 | target: (id)target selector: (SEL)selector object: (id)object1 object: (id)object2 object: (id)object3 object: (id)object4 arguments: (uint8_t)arguments | | > | 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 |
target: (id)target
selector: (SEL)selector
object: (id)object1
object: (id)object2
object: (id)object3
object: (id)object4
arguments: (uint8_t)arguments
repeats: (bool)repeats
OF_METHOD_FAMILY(init) OF_DIRECT
{
self = [super init];
@try {
_fireDate = [fireDate retain];
_interval = interval;
_target = [target retain];
|
| ︙ | ︙ |
Modified src/OFUDPSocket+Private.h from [cc4f2c83e7] to [bc60d66b62].
| ︙ | ︙ | |||
15 16 17 18 19 20 21 22 23 24 25 26 27 | * file. */ #import "OFUDPSocket.h" OF_ASSUME_NONNULL_BEGIN @interface OFUDPSocket () - (uint16_t)of_bindToAddress: (of_socket_address_t *)address extraType: (int)extraType; @end OF_ASSUME_NONNULL_END | > | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | * file. */ #import "OFUDPSocket.h" OF_ASSUME_NONNULL_BEGIN OF_DIRECT_MEMBERS @interface OFUDPSocket () - (uint16_t)of_bindToAddress: (of_socket_address_t *)address extraType: (int)extraType; @end OF_ASSUME_NONNULL_END |
Modified src/OFUDPSocket.m from [851b1788ef] to [8b135fcca2].
| ︙ | ︙ | |||
35 36 37 38 39 40 41 | #import "socket.h" #import "socket_helpers.h" @implementation OFUDPSocket @dynamic delegate; - (uint16_t)of_bindToAddress: (of_socket_address_t *)address | | | 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 |
#import "socket.h"
#import "socket_helpers.h"
@implementation OFUDPSocket
@dynamic delegate;
- (uint16_t)of_bindToAddress: (of_socket_address_t *)address
extraType: (int)extraType OF_DIRECT
{
void *pool = objc_autoreleasePoolPush();
OFString *host;
uint16_t port;
#if SOCK_CLOEXEC == 0 && defined(HAVE_FCNTL) && defined(FD_CLOEXEC)
int flags;
#endif
|
| ︙ | ︙ |
Modified src/OFURL.m from [71131960ae] to [2524e037d6].
| ︙ | ︙ | |||
83 84 85 86 87 88 89 90 91 92 93 94 95 96 |
static void
initURLQueryOrFragmentAllowedCharacterSet(void)
{
URLQueryOrFragmentAllowedCharacterSet =
[[OFURLQueryOrFragmentAllowedCharacterSet alloc] init];
}
@interface OFInvertedCharacterSetWithoutPercent: OFCharacterSet
{
OFCharacterSet *_characterSet;
bool (*_characterIsMember)(id, SEL, of_unichar_t);
}
- (instancetype)initWithCharacterSet: (OFCharacterSet *)characterSet;
| > | 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 |
static void
initURLQueryOrFragmentAllowedCharacterSet(void)
{
URLQueryOrFragmentAllowedCharacterSet =
[[OFURLQueryOrFragmentAllowedCharacterSet alloc] init];
}
OF_DIRECT_MEMBERS
@interface OFInvertedCharacterSetWithoutPercent: OFCharacterSet
{
OFCharacterSet *_characterSet;
bool (*_characterIsMember)(id, SEL, of_unichar_t);
}
- (instancetype)initWithCharacterSet: (OFCharacterSet *)characterSet;
|
| ︙ | ︙ |
Modified src/OFUTF8String+Private.h from [d056e7820f] to [03f2449d2e].
| ︙ | ︙ | |||
15 16 17 18 19 20 21 22 23 24 25 26 27 28 | * file. */ #import "OFUTF8String.h" OF_ASSUME_NONNULL_BEGIN @interface OFUTF8String () - (instancetype)of_initWithUTF8String: (const char *)UTF8String length: (size_t)UTF8StringLength storage: (char *)storage OF_METHOD_FAMILY(init); @end OF_ASSUME_NONNULL_END | > | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 | * file. */ #import "OFUTF8String.h" OF_ASSUME_NONNULL_BEGIN OF_DIRECT_MEMBERS @interface OFUTF8String () - (instancetype)of_initWithUTF8String: (const char *)UTF8String length: (size_t)UTF8StringLength storage: (char *)storage OF_METHOD_FAMILY(init); @end OF_ASSUME_NONNULL_END |
Modified src/OFWindowsRegistryKey.m from [adb04f0d00] to [db8bc56ab6].
| ︙ | ︙ | |||
30 31 32 33 34 35 36 37 38 39 40 41 42 43 | #import "OFGetWindowsRegistryValueFailedException.h" #import "OFInvalidEncodingException.h" #import "OFInvalidFormatException.h" #import "OFOpenWindowsRegistryKeyFailedException.h" #import "OFOutOfRangeException.h" #import "OFSetWindowsRegistryValueFailedException.h" @interface OFWindowsRegistryKey () - (instancetype)of_initWithHKey: (HKEY)hKey close: (bool)close; @end @implementation OFWindowsRegistryKey + (instancetype)classesRootKey | > | 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 | #import "OFGetWindowsRegistryValueFailedException.h" #import "OFInvalidEncodingException.h" #import "OFInvalidFormatException.h" #import "OFOpenWindowsRegistryKeyFailedException.h" #import "OFOutOfRangeException.h" #import "OFSetWindowsRegistryValueFailedException.h" OF_DIRECT_MEMBERS @interface OFWindowsRegistryKey () - (instancetype)of_initWithHKey: (HKEY)hKey close: (bool)close; @end @implementation OFWindowsRegistryKey + (instancetype)classesRootKey |
| ︙ | ︙ |
Modified src/OFXMLElement.m from [5b4791734b] to [a8d9602939].
| ︙ | ︙ | |||
424 425 426 427 428 429 430 | return ret; } - (OFString *)of_XMLStringWithParent: (OFXMLElement *)parent namespaces: (OFDictionary *)allNamespaces indentation: (unsigned int)indentation | | | 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 |
return ret;
}
- (OFString *)of_XMLStringWithParent: (OFXMLElement *)parent
namespaces: (OFDictionary *)allNamespaces
indentation: (unsigned int)indentation
level: (unsigned int)level OF_DIRECT
{
void *pool;
char *cString;
size_t length, i;
OFString *prefix, *parentPrefix;
OFString *ret;
OFString *defaultNS;
|
| ︙ | ︙ |
Modified src/OFXMLParser.h from [5c2cc1a7e0] to [12985c0c38].
| ︙ | ︙ | |||
149 150 151 152 153 154 155 | OF_XMLPARSER_EXPECT_SPACE_OR_TAG_CLOSE, OF_XMLPARSER_IN_EXCLAMATION_MARK, OF_XMLPARSER_IN_CDATA_OPENING, OF_XMLPARSER_IN_CDATA, OF_XMLPARSER_IN_COMMENT_OPENING, OF_XMLPARSER_IN_COMMENT_1, OF_XMLPARSER_IN_COMMENT_2, | | < | 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 | OF_XMLPARSER_EXPECT_SPACE_OR_TAG_CLOSE, OF_XMLPARSER_IN_EXCLAMATION_MARK, OF_XMLPARSER_IN_CDATA_OPENING, OF_XMLPARSER_IN_CDATA, OF_XMLPARSER_IN_COMMENT_OPENING, OF_XMLPARSER_IN_COMMENT_1, OF_XMLPARSER_IN_COMMENT_2, OF_XMLPARSER_IN_DOCTYPE } _state; size_t _i, _last; const char *_Nullable _data; OFMutableData *_buffer; OFString *_Nullable _name, *_Nullable _prefix; OFMutableArray OF_GENERIC(OFMutableDictionary OF_GENERIC(OFString *, OFString *) *) |
| ︙ | ︙ |
Modified src/OFXMLParser.m from [7ad1f08170] to [51abbe68ac].
| ︙ | ︙ | |||
37 38 39 40 41 42 43 | #import "OFInvalidArgumentException.h" #import "OFInvalidEncodingException.h" #import "OFInvalidFormatException.h" #import "OFMalformedXMLException.h" #import "OFOutOfRangeException.h" #import "OFUnboundPrefixException.h" | < < < < < < < < < < < < < < < < < < < < < < < < > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 |
#import "OFInvalidArgumentException.h"
#import "OFInvalidEncodingException.h"
#import "OFInvalidFormatException.h"
#import "OFMalformedXMLException.h"
#import "OFOutOfRangeException.h"
#import "OFUnboundPrefixException.h"
@interface OFXMLParser () <OFStringXMLUnescapingDelegate>
@end
static void inByteOrderMarkState(OFXMLParser *);
static void outsideTagState(OFXMLParser *);
static void tagOpenedState(OFXMLParser *);
static void inProcessingInstructionsState(OFXMLParser *);
static void inTagNameState(OFXMLParser *);
static void inCloseTagNameState(OFXMLParser *);
static void inTagState(OFXMLParser *);
static void inAttributeNameState(OFXMLParser *);
static void expectAttributeEqualSignState(OFXMLParser *);
static void expectAttributeDelimiterState(OFXMLParser *);
static void inAttributeValueState(OFXMLParser *);
static void expectTagCloseState(OFXMLParser *);
static void expectSpaceOrTagCloseState(OFXMLParser *);
static void inExclamationMarkState(OFXMLParser *);
static void inCDATAOpeningState(OFXMLParser *);
static void inCDATAState(OFXMLParser *);
static void inCommentOpeningState(OFXMLParser *);
static void inCommentState1(OFXMLParser *);
static void inCommentState2(OFXMLParser *);
static void inDOCTYPEState(OFXMLParser *);
typedef void (*state_function_t)(OFXMLParser *);
static state_function_t lookupTable[] = {
[OF_XMLPARSER_IN_BYTE_ORDER_MARK] = inByteOrderMarkState,
[OF_XMLPARSER_OUTSIDE_TAG] = outsideTagState,
[OF_XMLPARSER_TAG_OPENED] = tagOpenedState,
[OF_XMLPARSER_IN_PROCESSING_INSTRUCTIONS] =
inProcessingInstructionsState,
[OF_XMLPARSER_IN_TAG_NAME] = inTagNameState,
[OF_XMLPARSER_IN_CLOSE_TAG_NAME] = inCloseTagNameState,
[OF_XMLPARSER_IN_TAG] = inTagState,
[OF_XMLPARSER_IN_ATTRIBUTE_NAME] = inAttributeNameState,
[OF_XMLPARSER_EXPECT_ATTRIBUTE_EQUAL_SIGN] =
expectAttributeEqualSignState,
[OF_XMLPARSER_EXPECT_ATTRIBUTE_DELIMITER] =
expectAttributeDelimiterState,
[OF_XMLPARSER_IN_ATTRIBUTE_VALUE] = inAttributeValueState,
[OF_XMLPARSER_EXPECT_TAG_CLOSE] = expectTagCloseState,
[OF_XMLPARSER_EXPECT_SPACE_OR_TAG_CLOSE] = expectSpaceOrTagCloseState,
[OF_XMLPARSER_IN_EXCLAMATION_MARK] = inExclamationMarkState,
[OF_XMLPARSER_IN_CDATA_OPENING] = inCDATAOpeningState,
[OF_XMLPARSER_IN_CDATA] = inCDATAState,
[OF_XMLPARSER_IN_COMMENT_OPENING] = inCommentOpeningState,
[OF_XMLPARSER_IN_COMMENT_1] = inCommentState1,
[OF_XMLPARSER_IN_COMMENT_2] = inCommentState2,
[OF_XMLPARSER_IN_DOCTYPE] = inDOCTYPEState
};
static OF_INLINE void
appendToBuffer(OFMutableData *buffer, const char *string,
of_string_encoding_t encoding, size_t length)
{
if (OF_LIKELY(encoding == OF_STRING_ENCODING_UTF_8))
[buffer addItems: string
|
| ︙ | ︙ | |||
163 164 165 166 167 168 169 | [attribute->_namespace release]; attribute->_namespace = [attributeNS retain]; } @implementation OFXMLParser @synthesize delegate = _delegate, depthLimit = _depthLimit; | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 186 187 188 189 190 191 192 193 194 195 196 197 198 199 |
[attribute->_namespace release];
attribute->_namespace = [attributeNS retain];
}
@implementation OFXMLParser
@synthesize delegate = _delegate, depthLimit = _depthLimit;
+ (instancetype)parser
{
return [[[self alloc] init] autorelease];
}
- (instancetype)init
{
|
| ︙ | ︙ | |||
259 260 261 262 263 264 265 |
length: (size_t)length
{
_data = buffer;
for (_i = _last = 0; _i < length; _i++) {
size_t j = _i;
| | | 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 |
length: (size_t)length
{
_data = buffer;
for (_i = _last = 0; _i < length; _i++) {
size_t j = _i;
lookupTable[_state](self);
/* Ensure we don't count this character twice */
if (_i != j)
continue;
if (_data[_i] == '\r' || (_data[_i] == '\n' &&
!_lastCarriageReturn))
|
| ︙ | ︙ | |||
315 316 317 318 319 320 321 |
[self parseStream: file];
} @finally {
[file release];
}
}
#endif
| < < < < < | | | | | | | | | > | | > | | | | > | | | > | | | | | | > | | > | | | | | | | | | | | > | | | > | | | | 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 |
[self parseStream: file];
} @finally {
[file release];
}
}
#endif
static void
inByteOrderMarkState(OFXMLParser *self)
{
if (self->_data[self->_i] != "\xEF\xBB\xBF"[self->_level]) {
if (self->_level == 0) {
self->_state = OF_XMLPARSER_OUTSIDE_TAG;
self->_i--;
return;
}
@throw [OFMalformedXMLException exceptionWithParser: self];
}
if (self->_level++ == 2)
self->_state = OF_XMLPARSER_OUTSIDE_TAG;
self->_last = self->_i + 1;
}
/* Not in a tag */
static void
outsideTagState(OFXMLParser *self)
{
size_t length;
if ((self->_finishedParsing || self->_previous.count < 1) &&
self->_data[self->_i] != ' ' && self->_data[self->_i] != '\t' &&
self->_data[self->_i] != '\n' && self->_data[self->_i] != '\r' &&
self->_data[self->_i] != '<')
@throw [OFMalformedXMLException exceptionWithParser: self];
if (self->_data[self->_i] != '<')
return;
if ((length = self->_i - self->_last) > 0)
appendToBuffer(self->_buffer, self->_data + self->_last,
self->_encoding, length);
if (self->_buffer.count > 0) {
void *pool = objc_autoreleasePoolPush();
OFString *characters = transformString(self, self->_buffer, 0,
true);
if ([self->_delegate respondsToSelector:
@selector(parser:foundCharacters:)])
[self->_delegate parser: self
foundCharacters: characters];
objc_autoreleasePoolPop(pool);
}
[self->_buffer removeAllItems];
self->_last = self->_i + 1;
self->_state = OF_XMLPARSER_TAG_OPENED;
}
/* Tag was just opened */
static void
tagOpenedState(OFXMLParser *self)
{
if (self->_finishedParsing && self->_data[self->_i] != '!' &&
self->_data[self->_i] != '?')
@throw [OFMalformedXMLException exceptionWithParser: self];
switch (self->_data[self->_i]) {
case '?':
self->_last = self->_i + 1;
self->_state = OF_XMLPARSER_IN_PROCESSING_INSTRUCTIONS;
self->_level = 0;
break;
case '/':
self->_last = self->_i + 1;
self->_state = OF_XMLPARSER_IN_CLOSE_TAG_NAME;
self->_acceptProlog = false;
break;
case '!':
self->_last = self->_i + 1;
self->_state = OF_XMLPARSER_IN_EXCLAMATION_MARK;
self->_acceptProlog = false;
break;
default:
if (self->_depthLimit > 0 &&
self->_previous.count >= self->_depthLimit)
@throw [OFOutOfRangeException exception];
self->_state = OF_XMLPARSER_IN_TAG_NAME;
self->_acceptProlog = false;
self->_i--;
break;
}
}
/* <?xml […]?> */
static bool
parseXMLProcessingInstructions(OFXMLParser *self, OFString *pi)
{
const char *cString;
size_t length, last;
int PIState = 0;
OFString *attribute = nil;
OFMutableString *value = nil;
char piDelimiter = 0;
bool hasVersion = false;
if (!self->_acceptProlog)
return false;
self->_acceptProlog = false;
pi = [pi substringWithRange: of_range(3, pi.length - 3)];
pi = pi.stringByDeletingEnclosingWhitespaces;
cString = pi.UTF8String;
length = pi.UTF8StringLength;
|
| ︙ | ︙ | |||
447 448 449 450 451 452 453 | break; case 1: if (cString[i] != '=') continue; attribute = [OFString stringWithCString: cString + last | | | | | 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 |
break;
case 1:
if (cString[i] != '=')
continue;
attribute = [OFString
stringWithCString: cString + last
encoding: self->_encoding
length: i - last];
last = i + 1;
PIState = 2;
break;
case 2:
if (cString[i] != '\'' && cString[i] != '"')
return false;
piDelimiter = cString[i];
last = i + 1;
PIState = 3;
break;
case 3:
if (cString[i] != piDelimiter)
continue;
value = [OFMutableString
stringWithCString: cString + last
encoding: self->_encoding
length: i - last];
if ([attribute isEqual: @"version"]) {
if (![value hasPrefix: @"1."])
return false;
hasVersion = true;
}
if ([attribute isEqual: @"encoding"]) {
@try {
self->_encoding =
of_string_parse_encoding(value);
} @catch (OFInvalidArgumentException *e) {
@throw [OFInvalidEncodingException
exception];
}
}
|
| ︙ | ︙ | |||
502 503 504 505 506 507 508 | if (PIState != 0 || !hasVersion) return false; return true; } /* Inside processing instructions */ | > | | | | | > | | | | | | | | > | > | | | > | | | | | | | | | > | | | | | | | | | | | | | | | | | | | | | | | | | | > | > | | | > | | | | | | | | | | | | | > | | | | | | | | | | | | | | > | | > | | > | | | | | | | | > | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > | > | | | > | | | | | | | | | | > | | | | | | > | | | | | | | > | | | > | | > | | | | | | | | | | | | | | | | > | | | | > | | | | | > | > | | | | | | | | | | | > | | | | | | > | | < | | | > | | | | | | | | > | | | | | > | | | | | | > | | | > | > | | | | | | > | | > | > | | | | | | 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 |
if (PIState != 0 || !hasVersion)
return false;
return true;
}
/* Inside processing instructions */
static void
inProcessingInstructionsState(OFXMLParser *self)
{
if (self->_data[self->_i] == '?')
self->_level = 1;
else if (self->_level == 1 && self->_data[self->_i] == '>') {
void *pool = objc_autoreleasePoolPush();
OFString *PI;
appendToBuffer(self->_buffer, self->_data + self->_last,
self->_encoding, self->_i - self->_last);
PI = transformString(self, self->_buffer, 1, false);
if ([PI isEqual: @"xml"] || [PI hasPrefix: @"xml "] ||
[PI hasPrefix: @"xml\t"] || [PI hasPrefix: @"xml\r"] ||
[PI hasPrefix: @"xml\n"])
if (!parseXMLProcessingInstructions(self, PI))
@throw [OFMalformedXMLException
exceptionWithParser: self];
if ([self->_delegate respondsToSelector:
@selector(parser:foundProcessingInstructions:)])
[self->_delegate parser: self
foundProcessingInstructions: PI];
objc_autoreleasePoolPop(pool);
[self->_buffer removeAllItems];
self->_last = self->_i + 1;
self->_state = OF_XMLPARSER_OUTSIDE_TAG;
} else
self->_level = 0;
}
/* Inside a tag, no name yet */
static void
inTagNameState(OFXMLParser *self)
{
void *pool;
const char *bufferCString, *tmp;
size_t length, bufferLength;
OFString *bufferString;
if (self->_data[self->_i] != ' ' && self->_data[self->_i] != '\t' &&
self->_data[self->_i] != '\n' && self->_data[self->_i] != '\r' &&
self->_data[self->_i] != '>' && self->_data[self->_i] != '/')
return;
if ((length = self->_i - self->_last) > 0)
appendToBuffer(self->_buffer, self->_data + self->_last,
self->_encoding, length);
pool = objc_autoreleasePoolPush();
bufferCString = self->_buffer.items;
bufferLength = self->_buffer.count;
bufferString = [OFString stringWithUTF8String: bufferCString
length: bufferLength];
if ((tmp = memchr(bufferCString, ':', bufferLength)) != NULL) {
self->_name = [[OFString alloc]
initWithUTF8String: tmp + 1
length: bufferLength -
(tmp - bufferCString) - 1];
self->_prefix = [[OFString alloc]
initWithUTF8String: bufferCString
length: tmp - bufferCString];
} else {
self->_name = [bufferString copy];
self->_prefix = nil;
}
if (self->_data[self->_i] == '>' || self->_data[self->_i] == '/') {
OFString *namespace;
namespace = namespaceForPrefix(self->_prefix,
self->_namespaces);
if (self->_prefix != nil && namespace == nil)
@throw [OFUnboundPrefixException
exceptionWithPrefix: self->_prefix
parser: self];
if ([self->_delegate respondsToSelector: @selector(parser:
didStartElement:prefix:namespace:attributes:)])
[self->_delegate parser: self
didStartElement: self->_name
prefix: self->_prefix
namespace: namespace
attributes: nil];
if (self->_data[self->_i] == '/') {
if ([self->_delegate respondsToSelector:
@selector(parser:didEndElement:prefix:namespace:)])
[self->_delegate parser: self
didEndElement: self->_name
prefix: self->_prefix
namespace: namespace];
if (self->_previous.count == 0)
self->_finishedParsing = true;
} else
[self->_previous addObject: bufferString];
[self->_name release];
[self->_prefix release];
self->_name = self->_prefix = nil;
self->_state = (self->_data[self->_i] == '/'
? OF_XMLPARSER_EXPECT_TAG_CLOSE
: OF_XMLPARSER_OUTSIDE_TAG);
} else
self->_state = OF_XMLPARSER_IN_TAG;
if (self->_data[self->_i] != '/')
[self->_namespaces addObject: [OFMutableDictionary dictionary]];
objc_autoreleasePoolPop(pool);
[self->_buffer removeAllItems];
self->_last = self->_i + 1;
}
/* Inside a close tag, no name yet */
static void
inCloseTagNameState(OFXMLParser *self)
{
void *pool;
const char *bufferCString, *tmp;
size_t length, bufferLength;
OFString *bufferString, *namespace;
if (self->_data[self->_i] != ' ' && self->_data[self->_i] != '\t' &&
self->_data[self->_i] != '\n' && self->_data[self->_i] != '\r' &&
self->_data[self->_i] != '>')
return;
if ((length = self->_i - self->_last) > 0)
appendToBuffer(self->_buffer, self->_data + self->_last,
self->_encoding, length);
pool = objc_autoreleasePoolPush();
bufferCString = self->_buffer.items;
bufferLength = self->_buffer.count;
bufferString = [OFString stringWithUTF8String: bufferCString
length: bufferLength];
if ((tmp = memchr(bufferCString, ':', bufferLength)) != NULL) {
self->_name = [[OFString alloc]
initWithUTF8String: tmp + 1
length: bufferLength -
(tmp - bufferCString) - 1];
self->_prefix = [[OFString alloc]
initWithUTF8String: bufferCString
length: tmp - bufferCString];
} else {
self->_name = [bufferString copy];
self->_prefix = nil;
}
if (![self->_previous.lastObject isEqual: bufferString])
@throw [OFMalformedXMLException exceptionWithParser: self];
[self->_previous removeLastObject];
[self->_buffer removeAllItems];
namespace = namespaceForPrefix(self->_prefix, self->_namespaces);
if (self->_prefix != nil && namespace == nil)
@throw [OFUnboundPrefixException
exceptionWithPrefix: self->_prefix
parser: self];
if ([self->_delegate respondsToSelector:
@selector(parser:didEndElement:prefix:namespace:)])
[self->_delegate parser: self
didEndElement: self->_name
prefix: self->_prefix
namespace: namespace];
objc_autoreleasePoolPop(pool);
[self->_namespaces removeLastObject];
[self->_name release];
[self->_prefix release];
self->_name = self->_prefix = nil;
self->_last = self->_i + 1;
self->_state = (self->_data[self->_i] == '>'
? OF_XMLPARSER_OUTSIDE_TAG
: OF_XMLPARSER_EXPECT_SPACE_OR_TAG_CLOSE);
if (self->_previous.count == 0)
self->_finishedParsing = true;
}
/* Inside a tag, name found */
static void
inTagState(OFXMLParser *self)
{
void *pool;
OFString *namespace;
OFXMLAttribute *const *attributesObjects;
size_t attributesCount;
if (self->_data[self->_i] != '>' && self->_data[self->_i] != '/') {
if (self->_data[self->_i] != ' ' &&
self->_data[self->_i] != '\t' &&
self->_data[self->_i] != '\n' &&
self->_data[self->_i] != '\r') {
self->_last = self->_i;
self->_state = OF_XMLPARSER_IN_ATTRIBUTE_NAME;
self->_i--;
}
return;
}
attributesObjects = self->_attributes.objects;
attributesCount = self->_attributes.count;
namespace = namespaceForPrefix(self->_prefix, self->_namespaces);
if (self->_prefix != nil && namespace == nil)
@throw [OFUnboundPrefixException
exceptionWithPrefix: self->_prefix
parser: self];
for (size_t j = 0; j < attributesCount; j++)
resolveAttributeNamespace(attributesObjects[j],
self->_namespaces, self);
pool = objc_autoreleasePoolPush();
if ([self->_delegate respondsToSelector:
@selector(parser:didStartElement:prefix:namespace:attributes:)])
[self->_delegate parser: self
didStartElement: self->_name
prefix: self->_prefix
namespace: namespace
attributes: self->_attributes];
if (self->_data[self->_i] == '/') {
if ([self->_delegate respondsToSelector:
@selector(parser:didEndElement:prefix:namespace:)])
[self->_delegate parser: self
didEndElement: self->_name
prefix: self->_prefix
namespace: namespace];
if (self->_previous.count == 0)
self->_finishedParsing = true;
[self->_namespaces removeLastObject];
} else if (self->_prefix != nil) {
OFString *str = [OFString stringWithFormat:
@"%@:%@", self->_prefix, self->_name];
[self->_previous addObject: str];
} else
[self->_previous addObject: self->_name];
objc_autoreleasePoolPop(pool);
[self->_name release];
[self->_prefix release];
[self->_attributes removeAllObjects];
self->_name = self->_prefix = nil;
self->_last = self->_i + 1;
self->_state = (self->_data[self->_i] == '/'
? OF_XMLPARSER_EXPECT_TAG_CLOSE
: OF_XMLPARSER_OUTSIDE_TAG);
}
/* Looking for attribute name */
static void
inAttributeNameState(OFXMLParser *self)
{
void *pool;
OFString *bufferString;
const char *bufferCString, *tmp;
size_t length, bufferLength;
if (self->_data[self->_i] != '=' && self->_data[self->_i] != ' ' &&
self->_data[self->_i] != '\t' && self->_data[self->_i] != '\n' &&
self->_data[self->_i] != '\r')
return;
if ((length = self->_i - self->_last) > 0)
appendToBuffer(self->_buffer, self->_data + self->_last,
self->_encoding, length);
pool = objc_autoreleasePoolPush();
bufferString = [OFString stringWithUTF8String: self->_buffer.items
length: self->_buffer.count];
bufferCString = bufferString.UTF8String;
bufferLength = bufferString.UTF8StringLength;
if ((tmp = memchr(bufferCString, ':', bufferLength)) != NULL) {
self->_attributeName = [[OFString alloc]
initWithUTF8String: tmp + 1
length: bufferLength -
(tmp - bufferCString) - 1];
self->_attributePrefix = [[OFString alloc]
initWithUTF8String: bufferCString
length: tmp - bufferCString];
} else {
self->_attributeName = [bufferString copy];
self->_attributePrefix = nil;
}
objc_autoreleasePoolPop(pool);
[self->_buffer removeAllItems];
self->_last = self->_i + 1;
self->_state = (self->_data[self->_i] == '='
? OF_XMLPARSER_EXPECT_ATTRIBUTE_DELIMITER
: OF_XMLPARSER_EXPECT_ATTRIBUTE_EQUAL_SIGN);
}
/* Expecting equal sign of an attribute */
static void
expectAttributeEqualSignState(OFXMLParser *self)
{
if (self->_data[self->_i] == '=') {
self->_last = self->_i + 1;
self->_state = OF_XMLPARSER_EXPECT_ATTRIBUTE_DELIMITER;
return;
}
if (self->_data[self->_i] != ' ' && self->_data[self->_i] != '\t' &&
self->_data[self->_i] != '\n' && self->_data[self->_i] != '\r')
@throw [OFMalformedXMLException exceptionWithParser: self];
}
/* Expecting name/value delimiter of an attribute */
static void
expectAttributeDelimiterState(OFXMLParser *self)
{
self->_last = self->_i + 1;
if (self->_data[self->_i] == ' ' || self->_data[self->_i] == '\t' ||
self->_data[self->_i] == '\n' || self->_data[self->_i] == '\r')
return;
if (self->_data[self->_i] != '\'' && self->_data[self->_i] != '"')
@throw [OFMalformedXMLException exceptionWithParser: self];
self->_delimiter = self->_data[self->_i];
self->_state = OF_XMLPARSER_IN_ATTRIBUTE_VALUE;
}
/* Looking for attribute value */
static void
inAttributeValueState(OFXMLParser *self)
{
void *pool;
OFString *attributeValue;
size_t length;
OFXMLAttribute *attribute;
if (self->_data[self->_i] != self->_delimiter)
return;
if ((length = self->_i - self->_last) > 0)
appendToBuffer(self->_buffer, self->_data + self->_last,
self->_encoding, length);
pool = objc_autoreleasePoolPush();
attributeValue = transformString(self, self->_buffer, 0, true);
if (self->_attributePrefix == nil &&
[self->_attributeName isEqual: @"xmlns"])
[self->_namespaces.lastObject setObject: attributeValue
forKey: @""];
if ([self->_attributePrefix isEqual: @"xmlns"])
[self->_namespaces.lastObject setObject: attributeValue
forKey: self->_attributeName];
attribute = [OFXMLAttribute attributeWithName: self->_attributeName
namespace: self->_attributePrefix
stringValue: attributeValue];
attribute->_useDoubleQuotes = (self->_delimiter == '"');
[self->_attributes addObject: attribute];
objc_autoreleasePoolPop(pool);
[self->_buffer removeAllItems];
[self->_attributeName release];
[self->_attributePrefix release];
self->_attributeName = self->_attributePrefix = nil;
self->_last = self->_i + 1;
self->_state = OF_XMLPARSER_IN_TAG;
}
/* Expecting closing '>' */
static void
expectTagCloseState(OFXMLParser *self)
{
if (self->_data[self->_i] == '>') {
self->_last = self->_i + 1;
self->_state = OF_XMLPARSER_OUTSIDE_TAG;
} else
@throw [OFMalformedXMLException exceptionWithParser: self];
}
/* Expecting closing '>' or space */
static void
expectSpaceOrTagCloseState(OFXMLParser *self)
{
if (self->_data[self->_i] == '>') {
self->_last = self->_i + 1;
self->_state = OF_XMLPARSER_OUTSIDE_TAG;
} else if (self->_data[self->_i] != ' ' &&
self->_data[self->_i] != '\t' && self->_data[self->_i] != '\n' &&
self->_data[self->_i] != '\r')
@throw [OFMalformedXMLException exceptionWithParser: self];
}
/* In <! */
static void
inExclamationMarkState(OFXMLParser *self)
{
if (self->_finishedParsing && self->_data[self->_i] != '-')
@throw [OFMalformedXMLException exceptionWithParser: self];
if (self->_data[self->_i] == '-')
self->_state = OF_XMLPARSER_IN_COMMENT_OPENING;
else if (self->_data[self->_i] == '[') {
self->_state = OF_XMLPARSER_IN_CDATA_OPENING;
self->_level = 0;
} else if (self->_data[self->_i] == 'D') {
self->_state = OF_XMLPARSER_IN_DOCTYPE;
self->_level = 0;
} else
@throw [OFMalformedXMLException exceptionWithParser: self];
self->_last = self->_i + 1;
}
/* CDATA */
static void
inCDATAOpeningState(OFXMLParser *self)
{
if (self->_data[self->_i] != "CDATA["[self->_level])
@throw [OFMalformedXMLException exceptionWithParser: self];
if (++self->_level == 6) {
self->_state = OF_XMLPARSER_IN_CDATA;
self->_level = 0;
}
self->_last = self->_i + 1;
}
static void
inCDATAState(OFXMLParser *self)
{
if (self->_data[self->_i] == ']')
self->_level++;
else if (self->_data[self->_i] == '>' && self->_level >= 2) {
void *pool = objc_autoreleasePoolPush();
OFString *CDATA;
appendToBuffer(self->_buffer, self->_data + self->_last,
self->_encoding, self->_i - self->_last);
CDATA = transformString(self, self->_buffer, 2, false);
if ([self->_delegate respondsToSelector:
@selector(parser:foundCDATA:)])
[self->_delegate parser: self
foundCDATA: CDATA];
objc_autoreleasePoolPop(pool);
[self->_buffer removeAllItems];
self->_last = self->_i + 1;
self->_state = OF_XMLPARSER_OUTSIDE_TAG;
} else
self->_level = 0;
}
/* Comment */
static void
inCommentOpeningState(OFXMLParser *self)
{
if (self->_data[self->_i] != '-')
@throw [OFMalformedXMLException exceptionWithParser: self];
self->_last = self->_i + 1;
self->_state = OF_XMLPARSER_IN_COMMENT_1;
self->_level = 0;
}
static void
inCommentState1(OFXMLParser *self)
{
if (self->_data[self->_i] == '-')
self->_level++;
else
self->_level = 0;
if (self->_level == 2)
self->_state = OF_XMLPARSER_IN_COMMENT_2;
}
static void
inCommentState2(OFXMLParser *self)
{
void *pool;
OFString *comment;
if (self->_data[self->_i] != '>')
@throw [OFMalformedXMLException exceptionWithParser: self];
pool = objc_autoreleasePoolPush();
appendToBuffer(self->_buffer, self->_data + self->_last,
self->_encoding, self->_i - self->_last);
comment = transformString(self, self->_buffer, 2, false);
if ([self->_delegate respondsToSelector:
@selector(parser:foundComment:)])
[self->_delegate parser: self
foundComment: comment];
objc_autoreleasePoolPop(pool);
[self->_buffer removeAllItems];
self->_last = self->_i + 1;
self->_state = OF_XMLPARSER_OUTSIDE_TAG;
}
/* In <!DOCTYPE ...> */
static void
inDOCTYPEState(OFXMLParser *self)
{
if ((self->_level < 6 &&
self->_data[self->_i] != "OCTYPE"[self->_level]) ||
(self->_level == 6 && self->_data[self->_i] != ' ' &&
self->_data[self->_i] != '\t' && self->_data[self->_i] != '\n' &&
self->_data[self->_i] != '\r'))
@throw [OFMalformedXMLException exceptionWithParser: self];
self->_level++;
if (self->_level > 6 && self->_data[self->_i] == '>')
self->_state = OF_XMLPARSER_OUTSIDE_TAG;
self->_last = self->_i + 1;
}
- (size_t)lineNumber
{
return _lineNumber;
}
|
| ︙ | ︙ |
Modified src/OFZIPArchive.m from [bebc27a315] to [6d9893fc0c].
| ︙ | ︙ | |||
48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 |
/*
* FIXME: Current limitations:
* - Split archives are not supported.
* - Encrypted files cannot be read.
*/
@interface OFZIPArchive ()
- (void)of_readZIPInfo;
- (void)of_readEntries;
- (void)of_closeLastReturnedStream;
- (void)of_writeCentralDirectory;
@end
@interface OFZIPArchiveLocalFileHeader: OFObject
{
@public
uint16_t _minVersionNeeded, _generalPurposeBitFlag, _compressionMethod;
uint16_t _lastModifiedFileTime, _lastModifiedFileDate;
uint32_t _CRC32;
uint64_t _compressedSize, _uncompressedSize;
OFString *_fileName;
OFData *_extraField;
}
- (instancetype)initWithStream: (OFStream *)stream;
- (bool)matchesEntry: (OFZIPArchiveEntry *)entry;
@end
@interface OFZIPArchiveFileReadStream: OFStream
{
OFStream *_stream, *_decompressedStream;
OFZIPArchiveEntry *_entry;
uint64_t _toRead;
uint32_t _CRC32;
bool _atEndOfStream;
}
- (instancetype)of_initWithStream: (OFStream *)stream
entry: (OFZIPArchiveEntry *)entry;
@end
@interface OFZIPArchiveFileWriteStream: OFStream
{
OFStream *_stream;
uint32_t _CRC32;
@public
int64_t _bytesWritten;
OFMutableZIPArchiveEntry *_entry;
| > > > > | 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 |
/*
* FIXME: Current limitations:
* - Split archives are not supported.
* - Encrypted files cannot be read.
*/
OF_DIRECT_MEMBERS
@interface OFZIPArchive ()
- (void)of_readZIPInfo;
- (void)of_readEntries;
- (void)of_closeLastReturnedStream;
- (void)of_writeCentralDirectory;
@end
OF_DIRECT_MEMBERS
@interface OFZIPArchiveLocalFileHeader: OFObject
{
@public
uint16_t _minVersionNeeded, _generalPurposeBitFlag, _compressionMethod;
uint16_t _lastModifiedFileTime, _lastModifiedFileDate;
uint32_t _CRC32;
uint64_t _compressedSize, _uncompressedSize;
OFString *_fileName;
OFData *_extraField;
}
- (instancetype)initWithStream: (OFStream *)stream;
- (bool)matchesEntry: (OFZIPArchiveEntry *)entry;
@end
OF_DIRECT_MEMBERS
@interface OFZIPArchiveFileReadStream: OFStream
{
OFStream *_stream, *_decompressedStream;
OFZIPArchiveEntry *_entry;
uint64_t _toRead;
uint32_t _CRC32;
bool _atEndOfStream;
}
- (instancetype)of_initWithStream: (OFStream *)stream
entry: (OFZIPArchiveEntry *)entry;
@end
OF_DIRECT_MEMBERS
@interface OFZIPArchiveFileWriteStream: OFStream
{
OFStream *_stream;
uint32_t _CRC32;
@public
int64_t _bytesWritten;
OFMutableZIPArchiveEntry *_entry;
|
| ︙ | ︙ |
Modified src/OFZIPArchiveEntry+Private.h from [4c3ba1613a] to [19e5b08dac].
| ︙ | ︙ | |||
20 21 22 23 24 25 26 |
OF_ASSUME_NONNULL_BEGIN
@interface OFZIPArchiveEntry ()
@property (readonly, nonatomic)
uint16_t of_lastModifiedFileTime, of_lastModifiedFileDate;
@property (readonly, nonatomic) int64_t of_localFileHeaderOffset;
| | > | | 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 |
OF_ASSUME_NONNULL_BEGIN
@interface OFZIPArchiveEntry ()
@property (readonly, nonatomic)
uint16_t of_lastModifiedFileTime, of_lastModifiedFileDate;
@property (readonly, nonatomic) int64_t of_localFileHeaderOffset;
- (instancetype)of_initWithStream: (OFStream *)stream
OF_METHOD_FAMILY(init) OF_DIRECT;
- (uint64_t)of_writeToStream: (OFStream *)stream OF_DIRECT;
@end
@interface OFMutableZIPArchiveEntry ()
@property (readwrite, nonatomic, setter=of_setLocalFileHeaderOffset:)
int64_t of_localFileHeaderOffset;
@end
OF_ASSUME_NONNULL_END
|
Modified src/ObjFW.h from [2b3ccfe1ed] to [253b474482].
| ︙ | ︙ | |||
66 67 68 69 70 71 72 73 74 75 76 77 78 79 | #ifdef OF_HAVE_FILES # import "OFFile.h" # import "OFINIFile.h" # import "OFSettings.h" #endif #ifdef OF_HAVE_SOCKETS # import "OFStreamSocket.h" # import "OFTCPSocket.h" # import "OFUDPSocket.h" # import "OFTLSSocket.h" # import "OFKernelEventObserver.h" # import "OFDNSQuery.h" # import "OFDNSResourceRecord.h" # import "OFDNSResponse.h" | > > | 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 | #ifdef OF_HAVE_FILES # import "OFFile.h" # import "OFINIFile.h" # import "OFSettings.h" #endif #ifdef OF_HAVE_SOCKETS # import "OFStreamSocket.h" # import "OFDatagramSocket.h" # import "OFSequencedPacketSocket.h" # import "OFTCPSocket.h" # import "OFUDPSocket.h" # import "OFTLSSocket.h" # import "OFKernelEventObserver.h" # import "OFDNSQuery.h" # import "OFDNSResourceRecord.h" # import "OFDNSResponse.h" |
| ︙ | ︙ | |||
244 245 246 247 248 249 250 251 252 253 254 255 256 257 | #endif #import "OFLocking.h" #import "OFThread.h" #import "once.h" #ifdef OF_HAVE_THREADS # import "thread.h" # import "mutex.h" # import "condition.h" # import "OFMutex.h" # import "OFRecursiveMutex.h" # import "OFCondition.h" #endif | > | 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 | #endif #import "OFLocking.h" #import "OFThread.h" #import "once.h" #ifdef OF_HAVE_THREADS # import "thread.h" # import "tlskey.h" # import "mutex.h" # import "condition.h" # import "OFMutex.h" # import "OFRecursiveMutex.h" # import "OFCondition.h" #endif |
| ︙ | ︙ |
Modified src/exceptions/OFDNSQueryFailedException.m from [0c0fa9832e] to [1f9661bb22].
| ︙ | ︙ | |||
40 41 42 43 44 45 46 47 48 49 50 51 52 53 | return @"The server returned an error that the domain does not " @"exist."; case OF_DNS_RESOLVER_ERROR_SERVER_NOT_IMPLEMENTED: return @"The server does not have support for the requested " @"query."; case OF_DNS_RESOLVER_ERROR_SERVER_REFUSED: return @"The server refused the query."; default: return @"Unknown error."; } } @implementation OFDNSQueryFailedException @synthesize query = _query, error = _error; | > > | 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 | return @"The server returned an error that the domain does not " @"exist."; case OF_DNS_RESOLVER_ERROR_SERVER_NOT_IMPLEMENTED: return @"The server does not have support for the requested " @"query."; case OF_DNS_RESOLVER_ERROR_SERVER_REFUSED: return @"The server refused the query."; case OF_DNS_RESOLVER_ERROR_NO_NAME_SERVER: return @"There was no name server to query."; default: return @"Unknown error."; } } @implementation OFDNSQueryFailedException @synthesize query = _query, error = _error; |
| ︙ | ︙ |
Modified src/forwarding/apple-forwarding-i386.S from [b4b70f083a] to [288bef5c12].
| ︙ | ︙ | |||
13 14 15 16 17 18 19 20 21 22 23 | * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" .globl _of_forward .globl _of_forward_stret .section __TEXT, __cstring, cstring_literals | > > | | | | | | | | | | > | > | | | | > | | | | > | | | | | | | | | | | | | | | | > | > | | | | > | | | | > | | | | | | | | | | | 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 | * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" .intel_syntax noprefix .globl _of_forward .globl _of_forward_stret .section __TEXT, __cstring, cstring_literals Lstr_forwardingTargetForSelector_: .asciz "forwardingTargetForSelector:" .section __OBJC, __message_refs, literal_pointers, no_dead_strip Lsel_forwardingTargetForSelector_: .long Lstr_forwardingTargetForSelector_ .section __OBJC, __image_info .long 0, 0 .section __TEXT, __text, regular, pure_instructions _of_forward: push ebp mov ebp, esp push ebx sub esp, 20 call get_eip 0: mov eax, [ebp+8] mov [esp], eax call _object_getClass mov [esp], eax .att_syntax /* Next line is broken in Intel syntax */ movl Lsel_forwardingTargetForSelector_-0b(%ebx), %eax .intel_syntax noprefix mov [esp+4], eax call _class_respondsToSelector test eax, eax jz 0f mov eax, [ebp+8] mov [esp], eax .att_syntax /* Next line is broken in Intel syntax */ movl Lsel_forwardingTargetForSelector_-0b(%ebx), %eax .intel_syntax noprefix mov [esp+4], eax mov eax, [ebp+12] mov [esp+8], eax call _objc_msgSend test eax, eax jz 0f cmp eax, [ebp+8] je 0f mov [ebp+8], eax add esp, 20 pop ebx pop ebp jmp _objc_msgSend 0: add esp, 20 pop ebx pop ebp jmp _of_method_not_found _of_forward_stret: push ebp mov ebp, esp push ebx sub esp, 20 call get_eip 0: mov eax, [ebp+12] mov [esp], eax call _object_getClass mov [esp], eax .att_syntax /* Next line is broken in Intel syntax */ movl Lsel_forwardingTargetForSelector_-0b(%ebx), %eax .intel_syntax noprefix mov [esp+4], eax call _class_respondsToSelector test eax, eax jz 0f mov eax, [ebp+12] mov [esp], eax .att_syntax /* Next line is broken in Intel syntax */ movl Lsel_forwardingTargetForSelector_-0b(%ebx), %eax .intel_syntax noprefix mov [esp+4], eax mov eax, [ebp+16] mov [esp+8], eax call _objc_msgSend test eax, eax jz 0f cmp eax, [ebp+12] je 0f mov [ebp+12], eax add esp, 20 pop ebx pop ebp jmp _objc_msgSend_stret 0: add esp, 20 pop ebx pop ebp jmp _of_method_not_found_stret get_eip: mov ebx, [esp] ret |
Modified src/forwarding/apple-forwarding-x86_64.S from [b46de1999b] to [5b8fcf7945].
| ︙ | ︙ | |||
13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 | * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" .globl _of_forward .globl _of_forward_stret .section __TEXT, __objc_methname, cstring_literals str_forwardingTargetForSelector_: .asciz "forwardingTargetForSelector:" .section __DATA, __objc_selrefs, literal_pointers, no_dead_strip sel_forwardingTargetForSelector_: .quad str_forwardingTargetForSelector_ .section __DATA, __objc_imageinfo, regular, no_dead_strip .long 0, 0 .section __TEXT, __text, regular, pure_instructions _of_forward: | > > | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 | * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" .intel_syntax noprefix .globl _of_forward .globl _of_forward_stret .section __TEXT, __objc_methname, cstring_literals str_forwardingTargetForSelector_: .asciz "forwardingTargetForSelector:" .section __DATA, __objc_selrefs, literal_pointers, no_dead_strip sel_forwardingTargetForSelector_: .quad str_forwardingTargetForSelector_ .section __DATA, __objc_imageinfo, regular, no_dead_strip .long 0, 0 .section __TEXT, __text, regular, pure_instructions _of_forward: push rbp mov rbp, rsp /* Save all arguments */ sub rsp, 0xC0 /* 16-byte alignment */ mov [rbp-0x08], rax mov [rbp-0x10], rdi mov [rbp-0x18], rsi mov [rbp-0x20], rdx mov [rbp-0x28], rcx mov [rbp-0x30], r8 mov [rbp-0x38], r9 movaps [rbp-0x50], xmm0 movaps [rbp-0x60], xmm1 movaps [rbp-0x70], xmm2 movaps [rbp-0x80], xmm3 movaps [rbp-0x90], xmm4 movaps [rbp-0xA0], xmm5 movaps [rbp-0xB0], xmm6 movaps [rbp-0xC0], xmm7 call _object_getClass mov rdi, rax mov rsi, [rip+sel_forwardingTargetForSelector_] call _class_respondsToSelector test rax, rax jz 0f mov rdi, [rbp-0x10] mov rsi, [rip+sel_forwardingTargetForSelector_] mov rdx, [rbp-0x18] call _objc_msgSend test rax, rax jz 0f cmp rax, [rbp-0x10] je 0f mov rdi, rax /* Restore all arguments, except %rdi */ movaps xmm7, [rbp-0xC0] movaps xmm6, [rbp-0xB0] movaps xmm5, [rbp-0xA0] movaps xmm4, [rbp-0x90] movaps xmm3, [rbp-0x80] movaps xmm2, [rbp-0x70] movaps xmm1, [rbp-0x60] movaps xmm0, [rbp-0x50] mov r9, [rbp-0x38] mov r8, [rbp-0x30] mov rcx, [rbp-0x28] mov rdx, [rbp-0x20] mov rsi, [rbp-0x18] mov rax, [rbp-0x08] mov rsp, rbp pop rbp jmp _objc_msgSend 0: mov rdi, [rbp-0x10] mov rsi, [rbp-0x18] mov rsp, rbp pop rbp jmp _of_method_not_found _of_forward_stret: push rbp mov rbp, rsp /* Save all arguments */ sub rsp, 0xC0 /* 16-byte alignment */ mov [rbp-0x08], rax mov [rbp-0x10], rdi mov [rbp-0x18], rsi mov [rbp-0x20], rdx mov [rbp-0x28], rcx mov [rbp-0x30], r8 mov [rbp-0x38], r9 movaps [rbp-0x50], xmm0 movaps [rbp-0x60], xmm1 movaps [rbp-0x70], xmm2 movaps [rbp-0x80], xmm3 movaps [rbp-0x90], xmm4 movaps [rbp-0xA0], xmm5 movaps [rbp-0xB0], xmm6 movaps [rbp-0xC0], xmm7 mov rdi, rsi call _object_getClass mov rdi, rax mov rsi, [rip+sel_forwardingTargetForSelector_] call _class_respondsToSelector test rax, rax jz 0f mov rdi, [rbp-0x18] mov rsi, [rip+sel_forwardingTargetForSelector_] mov rdx, [rbp-0x20] call _objc_msgSend test rax, rax jz 0f cmp rax, [rbp-0x18] je 0f mov rsi, rax /* Restore all arguments, except %rsi */ movaps xmm7, [rbp-0xC0] movaps xmm6, [rbp-0xB0] movaps xmm5, [rbp-0xA0] movaps xmm4, [rbp-0x90] movaps xmm3, [rbp-0x80] movaps xmm2, [rbp-0x70] movaps xmm1, [rbp-0x60] movaps xmm0, [rbp-0x50] mov r9, [rbp-0x38] mov r8, [rbp-0x30] mov rcx, [rbp-0x28] mov rdx, [rbp-0x20] mov rdi, [rbp-0x10] mov rax, [rbp-0x08] mov rsp, rbp pop rbp jmp _objc_msgSend_stret 0: mov rdi, [rbp-0x10] mov rsi, [rbp-0x18] mov rdx, [rbp-0x20] mov rsp, rbp pop rbp jmp _of_method_not_found_stret |
Added src/forwarding/forwarding-sparc-elf.S version [9eae73a539].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 | /* * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, * 2018, 2019, 2020 * Jonathan Schleifer <js@nil.im> * * All rights reserved. * * This file is part of ObjFW. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE.QPL included in * the packaging of this file. * * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #include "platform.h" .globl of_forward .globl of_forward_stret .section .text of_forward: save %sp, -96, %sp sethi %hi(_GLOBAL_OFFSET_TABLE_ - 4), %l7 call add_pc add %l7, %lo(_GLOBAL_OFFSET_TABLE_ + 4), %l7 mov %i0, %o0 call object_getClass nop sethi %hi(sel_forwardingTargetForSelector_), %o1 or %o1, %lo(sel_forwardingTargetForSelector_), %o1 ld [%l7 + %o1], %o1 call class_respondsToSelector nop cmp %o0, 0 be 0f mov %i0, %o0 sethi %hi(sel_forwardingTargetForSelector_), %o1 or %o1, %lo(sel_forwardingTargetForSelector_), %o1 ld [%l7 + %o1], %o1 call objc_msg_lookup nop mov %o0, %l0 mov %i0, %o0 sethi %hi(sel_forwardingTargetForSelector_), %o1 or %o1, %lo(sel_forwardingTargetForSelector_), %o1 ld [%l7 + %o1], %o1 jmpl %l0, %o7 mov %i1, %o2 cmp %o0, 0 be 0f cmp %o0, %i0 be 0f mov %o0, %i0 call objc_msg_lookup mov %i1, %o1 jmpl %o0, %g0 restore 0: call of_method_not_found restore .type of_forward, %function .size of_forward, .-of_forward of_forward_stret: save %sp, -96, %sp sethi %hi(_GLOBAL_OFFSET_TABLE_ - 4), %l7 call add_pc add %l7, %lo(_GLOBAL_OFFSET_TABLE_ + 4), %l7 mov %i1, %o0 call object_getClass nop sethi %hi(sel_forwardingTargetForSelector_), %o1 or %o1, %lo(sel_forwardingTargetForSelector_), %o1 ld [%l7 + %o1], %o1 call class_respondsToSelector nop cmp %o0, 0 be 0f mov %i1, %o0 sethi %hi(sel_forwardingTargetForSelector_), %o1 or %o1, %lo(sel_forwardingTargetForSelector_), %o1 ld [%l7 + %o1], %o1 call objc_msg_lookup nop mov %o0, %l0 mov %i1, %o0 sethi %hi(sel_forwardingTargetForSelector_), %o1 or %o1, %lo(sel_forwardingTargetForSelector_), %o1 ld [%l7 + %o1], %o1 jmpl %l0, %o7 mov %i2, %o2 cmp %o0, 0 be 0f cmp %o0, %i1 be 0f mov %o0, %i1 call objc_msg_lookup mov %i2, %o1 jmpl %o0, %g0 restore 0: call of_method_not_found_stret restore .type of_forward_stret, %function .size of_forward_stret, .-of_forward_stret init: save %sp, -96, %sp sethi %hi(_GLOBAL_OFFSET_TABLE_ - 4), %l7 call add_pc add %l7, %lo(_GLOBAL_OFFSET_TABLE_ + 4), %l7 sethi %hi(module), %i0 or %i0, %lo(module), %i0 ld [%l7 + %i0], %i0 call __objc_exec_class restore add_pc: jmp %o7 + 8 add %l7, %o7, %l7 #ifdef OF_SOLARIS .section .init_array, "aw" #else .section .ctors, "aw", %progbits #endif .word init .section .rodata str_forwardingTargetForSelector_: .asciz "forwardingTargetForSelector:" .section .data sel_forwardingTargetForSelector_: .word str_forwardingTargetForSelector_, 0 .word 0, 0 symtab: .word 0, sel_forwardingTargetForSelector_ .half 0, 0 .word 0 .word 0 module: .word 8, 16, 0, symtab #ifdef OF_LINUX .section .note.GNU-stack, "", %progbits #endif |
Modified src/forwarding/forwarding-sparc64-elf.S from [bea41e7809] to [af08d696f6].
| ︙ | ︙ | |||
59 60 61 62 63 64 65 | sethi %hi(sel_forwardingTargetForSelector_), %o1 or %o1, %lo(sel_forwardingTargetForSelector_), %o1 ldx [%l7 + %o1], %o1 call class_respondsToSelector nop | | < < | | < < | < | | 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 | sethi %hi(sel_forwardingTargetForSelector_), %o1 or %o1, %lo(sel_forwardingTargetForSelector_), %o1 ldx [%l7 + %o1], %o1 call class_respondsToSelector nop brz,pn %o0, 0f mov %i0, %o0 sethi %hi(sel_forwardingTargetForSelector_), %o1 or %o1, %lo(sel_forwardingTargetForSelector_), %o1 ldx [%l7 + %o1], %o1 call objc_msg_lookup nop mov %o0, %l0 mov %i0, %o0 sethi %hi(sel_forwardingTargetForSelector_), %o1 or %o1, %lo(sel_forwardingTargetForSelector_), %o1 ldx [%l7 + %o1], %o1 jmpl %l0, %o7 mov %i1, %o2 brz,pn %o0, 0f cmp %o0, %i0 be,pn %xcc, 0f mov %o0, %i0 call objc_msg_lookup mov %i1, %o1 /* * Restore all floating point registers as they can be used for * parameter passing. */ |
| ︙ | ︙ | |||
157 158 159 160 161 162 163 | sethi %hi(sel_forwardingTargetForSelector_), %o1 or %o1, %lo(sel_forwardingTargetForSelector_), %o1 ldx [%l7 + %o1], %o1 call class_respondsToSelector nop | | < < | | < < | < | | 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 | sethi %hi(sel_forwardingTargetForSelector_), %o1 or %o1, %lo(sel_forwardingTargetForSelector_), %o1 ldx [%l7 + %o1], %o1 call class_respondsToSelector nop brz,pn %o0, 0f mov %i1, %o0 sethi %hi(sel_forwardingTargetForSelector_), %o1 or %o1, %lo(sel_forwardingTargetForSelector_), %o1 ldx [%l7 + %o1], %o1 call objc_msg_lookup nop mov %o0, %l0 mov %i1, %o0 sethi %hi(sel_forwardingTargetForSelector_), %o1 or %o1, %lo(sel_forwardingTargetForSelector_), %o1 ldx [%l7 + %o1], %o1 jmpl %l0, %o7 mov %i2, %o2 brz,pn %o0, 0f cmp %o0, %i1 be,pn %xcc, 0f mov %o0, %i1 call objc_msg_lookup mov %i2, %o1 /* * Restore all floating point registers as they can be used for * parameter passing. */ |
| ︙ | ︙ |
Modified src/forwarding/forwarding-x86-elf.S from [9bcb5fc324] to [294c10a12e].
| ︙ | ︙ | |||
15 16 17 18 19 20 21 22 23 24 25 26 | * file. */ #include "config.h" #include "platform.h" .globl of_forward .globl of_forward_stret .section .text of_forward: | > > | | | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | | | | | | | | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | | | | | | | | | < | | | | < | | | | | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 | * file. */ #include "config.h" #include "platform.h" .intel_syntax noprefix .globl of_forward .globl of_forward_stret .section .text of_forward: push ebp mov ebp, esp push ebx sub esp, 20 call get_eip add ebx, offset _GLOBAL_OFFSET_TABLE_ mov eax, [ebp+8] mov [esp], eax call object_getClass@PLT mov [esp], eax lea eax, [ebx+sel_forwardingTargetForSelector_@GOTOFF] mov [esp+4], eax call class_respondsToSelector@PLT test eax, eax jz short 0f mov eax, [ebp+8] mov [esp], eax lea eax, [ebx+sel_forwardingTargetForSelector_@GOTOFF] mov [esp+4], eax call objc_msg_lookup@PLT mov edx, [ebp+8] mov [esp], edx lea edx, [ebx+sel_forwardingTargetForSelector_@GOTOFF] mov [esp+4], edx mov edx, [ebp+12] mov [esp+8], edx call eax test eax, eax jz short 0f cmp eax, [ebp+8] je short 0f mov [ebp+8], eax mov [esp], eax mov eax, [ebp+12] mov [esp+4], eax call objc_msg_lookup@PLT add esp, 20 pop ebx pop ebp jmp eax 0: lea eax, [ebx+of_method_not_found@GOTOFF] add esp, 20 pop ebx pop ebp jmp eax .type of_forward, %function .size of_forward, .-of_forward of_forward_stret: push ebp mov ebp, esp push ebx sub esp, 20 call get_eip add ebx, offset _GLOBAL_OFFSET_TABLE_ mov eax, [ebp+12] mov [esp], eax call object_getClass@PLT mov [esp], eax lea eax, [ebx+sel_forwardingTargetForSelector_@GOTOFF] mov [esp+4], eax call class_respondsToSelector@PLT test eax, eax jz short 0f mov eax, [ebp+12] mov [esp], eax lea eax, [ebx+sel_forwardingTargetForSelector_@GOTOFF] mov [esp+4], eax call objc_msg_lookup@PLT mov edx, [ebp+12] mov [esp], edx lea edx, [ebx+sel_forwardingTargetForSelector_@GOTOFF] mov [esp+4], edx mov edx, [ebp+16] mov [esp+8], edx call eax test eax, eax jz short 0f cmp eax, [ebp+12] je short 0f mov [ebp+12], eax mov [esp], eax mov eax, [ebp+16] mov [esp+4], eax call objc_msg_lookup_stret@PLT add esp, 20 pop ebx pop ebp jmp eax 0: lea eax, [ebx+of_method_not_found_stret@GOTOFF] add esp, 20 pop ebx pop ebp jmp eax .type of_forward_stret, %function .size of_forward_stret, .-of_forward_stret init: push ebp mov ebp, esp push ebx sub esp, 4 call get_eip add ebx, offset _GLOBAL_OFFSET_TABLE_ lea eax, [ebx+module@GOTOFF] mov [esp], eax call __objc_exec_class@PLT add esp, 4 pop ebx pop ebp ret get_eip: mov ebx, [esp] ret #ifdef OF_SOLARIS .section .init_array, "aw" #else .section .ctors, "aw", %progbits #endif |
| ︙ | ︙ |
Modified src/forwarding/forwarding-x86-win32.S from [2062a9ecd0] to [38023e4835].
| ︙ | ︙ | |||
13 14 15 16 17 18 19 20 21 22 23 24 | * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" .globl _of_forward .globl _of_forward_stret .section .text _of_forward: | > > | > > > | > > > | > > > > | > > > > > > > > > > > > > > | > > > > > > > > > > > > > > > > > > | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | | < < < | < < < < < < | > > > | > > > | > > > > | > > > > > > > > > > > > > > | > > > > > > > > > > > > > > > > > > | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | | < < < | < < < < < < | | | | < < | | | < | | | < < < < | 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 | * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" .intel_syntax noprefix .globl _of_forward .globl _of_forward_stret .section .text _of_forward: push ebp mov ebp, esp push ebx sub esp, 20 mov eax, [ebp+8] mov [esp], eax call _object_getClass mov [esp], eax mov eax, offset sel_forwardingTargetForSelector_ mov [esp+4], eax call _class_respondsToSelector test eax, eax jz short 0f mov eax, [ebp+8] mov [esp], eax mov eax, offset sel_forwardingTargetForSelector_ mov [esp+4], eax call _objc_msg_lookup mov edx, [ebp+8] mov [esp], edx mov edx, offset sel_forwardingTargetForSelector_ mov [esp+4], edx mov edx, [ebp+12] mov [esp+8], edx call eax test eax, eax jz short 0f cmp eax, [ebp+8] je short 0f mov [ebp+8], eax mov [esp], eax mov eax, [ebp+12] mov [esp+4], eax call _objc_msg_lookup add esp, 20 pop ebx pop ebp jmp eax 0: add esp, 20 pop ebx pop ebp jmp _of_method_not_found _of_forward_stret: push ebp mov ebp, esp push ebx sub esp, 20 mov eax, [ebp+12] mov [esp], eax call _object_getClass mov [esp], eax mov eax, offset sel_forwardingTargetForSelector_ mov [esp+4], eax call _class_respondsToSelector test eax, eax jz short 0f mov eax, [ebp+12] mov [esp], eax mov eax, offset sel_forwardingTargetForSelector_ mov [esp+4], eax call _objc_msg_lookup mov edx, [ebp+12] mov [esp], edx mov edx, offset sel_forwardingTargetForSelector_ mov [esp+4], edx mov edx, [ebp+16] mov [esp+8], edx call eax test eax, eax jz short 0f cmp eax, [ebp+12] je short 0f mov [ebp+12], eax mov [esp], eax mov eax, [ebp+16] mov [esp+4], eax call _objc_msg_lookup_stret add esp, 20 pop ebx pop ebp jmp eax 0: add esp, 20 pop ebx pop ebp jmp _of_method_not_found_stret init: push ebp mov ebp, esp push ebx sub esp, 4 mov eax, offset module mov [esp], eax call ___objc_exec_class add esp, 4 pop ebx pop ebp ret .section .ctors, "aw" .long init .section .rodata str_forwardingTargetForSelector_: |
| ︙ | ︙ |
Modified src/forwarding/forwarding-x86_64-elf.S from [d6c82663f6] to [1d1fc641cf].
| ︙ | ︙ | |||
15 16 17 18 19 20 21 22 23 24 25 26 | * file. */ #include "config.h" #include "platform.h" .globl of_forward .globl of_forward_stret .section .text of_forward: | > > | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 | * file. */ #include "config.h" #include "platform.h" .intel_syntax noprefix .globl of_forward .globl of_forward_stret .section .text of_forward: push rbp mov rbp, rsp /* Save all arguments */ sub rsp, 0xC0 /* 16-byte alignment */ mov [rbp-0x08], rax mov [rbp-0x10], rdi mov [rbp-0x18], rsi mov [rbp-0x20], rdx mov [rbp-0x28], rcx mov [rbp-0x30], r8 mov [rbp-0x38], r9 movaps [rbp-0x50], xmm0 movaps [rbp-0x60], xmm1 movaps [rbp-0x70], xmm2 movaps [rbp-0x80], xmm3 movaps [rbp-0x90], xmm4 movaps [rbp-0xA0], xmm5 movaps [rbp-0xB0], xmm6 movaps [rbp-0xC0], xmm7 call object_getClass@PLT mov rdi, rax lea rsi, [rip+sel_forwardingTargetForSelector_] call class_respondsToSelector@PLT test rax, rax jz short 0f mov rdi, [rbp-0x10] lea rsi, [rip+sel_forwardingTargetForSelector_] call objc_msg_lookup@PLT mov rdi, [rbp-0x10] lea rsi, [rip+sel_forwardingTargetForSelector_] mov rdx, [rbp-0x18] call rax test rax, rax jz short 0f cmp rax, [rbp-0x10] je short 0f mov [rbp-0x10], rax mov rdi, rax mov rsi, [rbp-0x18] call objc_msg_lookup@PLT mov r11, rax /* Restore all arguments */ movaps xmm7, [rbp-0xC0] movaps xmm6, [rbp-0xB0] movaps xmm5, [rbp-0xA0] movaps xmm4, [rbp-0x90] movaps xmm3, [rbp-0x80] movaps xmm2, [rbp-0x70] movaps xmm1, [rbp-0x60] movaps xmm0, [rbp-0x50] mov r9, [rbp-0x38] mov r8, [rbp-0x30] mov rcx, [rbp-0x28] mov rdx, [rbp-0x20] mov rsi, [rbp-0x18] mov rdi, [rbp-0x10] mov rax, [rbp-0x08] mov rsp, rbp pop rbp jmp r11 0: mov rdi, [rbp-0x10] mov rsi, [rbp-0x18] mov rsp, rbp pop rbp jmp of_method_not_found@PLT .type of_forward, %function .size of_forward, .-of_forward of_forward_stret: push rbp mov rbp, rsp /* Save all arguments */ sub rsp, 0xC0 /* 16-byte alignment */ mov [rbp-0x08], rax mov [rbp-0x10], rdi mov [rbp-0x18], rsi mov [rbp-0x20], rdx mov [rbp-0x28], rcx mov [rbp-0x30], r8 mov [rbp-0x38], r9 movaps [rbp-0x50], xmm0 movaps [rbp-0x60], xmm1 movaps [rbp-0x70], xmm2 movaps [rbp-0x80], xmm3 movaps [rbp-0x90], xmm4 movaps [rbp-0xA0], xmm5 movaps [rbp-0xB0], xmm6 movaps [rbp-0xC0], xmm7 mov rdi, rsi call object_getClass@PLT mov rdi, rax lea rsi, [rip+sel_forwardingTargetForSelector_] call class_respondsToSelector@PLT test rax, rax jz short 0f mov rdi, [rbp-0x18] lea rsi, [rip+sel_forwardingTargetForSelector_] call objc_msg_lookup@PLT mov rdi, [rbp-0x18] lea rsi, [rip+sel_forwardingTargetForSelector_] mov rdx, [rbp-0x20] call rax test rax, rax jz short 0f cmp rax, [rbp-0x18] je short 0f mov [rbp-0x18], rax mov rdi, rax mov rsi, [rbp-0x20] call objc_msg_lookup_stret@PLT mov r11, rax /* Restore all arguments */ movaps xmm7, [rbp-0xC0] movaps xmm6, [rbp-0xB0] movaps xmm5, [rbp-0xA0] movaps xmm4, [rbp-0x90] movaps xmm3, [rbp-0x80] movaps xmm2, [rbp-0x70] movaps xmm1, [rbp-0x60] movaps xmm0, [rbp-0x50] mov r9, [rbp-0x38] mov r8, [rbp-0x30] mov rcx, [rbp-0x28] mov rdx, [rbp-0x20] mov rsi, [rbp-0x18] mov rdi, [rbp-0x10] mov rax, [rbp-0x08] mov rsp, rbp pop rbp jmp r11 0: mov rdi, [rbp-0x10] mov rsi, [rbp-0x18] mov rdx, [rbp-0x20] mov rsp, rbp pop rbp jmp of_method_not_found_stret@PLT .type of_forward_stret, %function .size of_forward_stret, .-of_forward_stret init: lea rdi, [rip+module] jmp __objc_exec_class@PLT #ifdef OF_SOLARIS .section .init_array, "aw" #else .section .ctors, "aw", %progbits #endif |
| ︙ | ︙ |
Modified src/forwarding/forwarding-x86_64-macho.S from [42dfac05fa] to [4631e2d50d].
| ︙ | ︙ | |||
15 16 17 18 19 20 21 22 23 24 25 26 | * file. */ #include "config.h" #include "platform.h" .globl _of_forward .globl _of_forward_stret .section __TEXT, __text, regular, pure_instructions _of_forward: | > > | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 | * file. */ #include "config.h" #include "platform.h" .intel_syntax noprefix .globl _of_forward .globl _of_forward_stret .section __TEXT, __text, regular, pure_instructions _of_forward: push rbp mov rbp, rsp /* Save all arguments */ sub rsp, 0xC0 /* 16-byte alignment */ mov [rbp-0x08], rax mov [rbp-0x10], rdi mov [rbp-0x18], rsi mov [rbp-0x20], rdx mov [rbp-0x28], rcx mov [rbp-0x30], r8 mov [rbp-0x38], r9 movaps [rbp-0x50], xmm0 movaps [rbp-0x60], xmm1 movaps [rbp-0x70], xmm2 movaps [rbp-0x80], xmm3 movaps [rbp-0x90], xmm4 movaps [rbp-0xA0], xmm5 movaps [rbp-0xB0], xmm6 movaps [rbp-0xC0], xmm7 call _object_getClass mov rdi, rax lea rsi, [rip+sel_forwardingTargetForSelector_] call _class_respondsToSelector test rax, rax jz 0f mov rdi, [rbp-0x10] lea rsi, [rip+sel_forwardingTargetForSelector_] call _objc_msg_lookup mov rdi, [rbp-0x10] lea rsi, [rip+sel_forwardingTargetForSelector_] mov rdx, [rbp-0x18] call rax test rax, rax jz 0f cmp rax, [rbp-0x10] je 0f mov [rbp-0x10], rax mov rdi, rax mov rsi, [rbp-0x18] call _objc_msg_lookup mov r11, rax /* Restore all arguments */ movaps xmm7, [rbp-0xC0] movaps xmm6, [rbp-0xB0] movaps xmm5, [rbp-0xA0] movaps xmm4, [rbp-0x90] movaps xmm3, [rbp-0x80] movaps xmm2, [rbp-0x70] movaps xmm1, [rbp-0x60] movaps xmm0, [rbp-0x50] mov r9, [rbp-0x38] mov r8, [rbp-0x30] mov rcx, [rbp-0x28] mov rdx, [rbp-0x20] mov rsi, [rbp-0x18] mov rdi, [rbp-0x10] mov rax, [rbp-0x08] mov rsp, rbp pop rbp jmp r11 0: mov rdi, [rbp-0x10] mov rsi, [rbp-0x18] mov rsp, rbp pop rbp jmp _of_method_not_found _of_forward_stret: push rbp mov rbp, rsp /* Save all arguments */ sub rsp, 0xC0 /* 16-byte alignment */ mov [rbp-0x08], rax mov [rbp-0x10], rdi mov [rbp-0x18], rsi mov [rbp-0x20], rdx mov [rbp-0x28], rcx mov [rbp-0x30], r8 mov [rbp-0x38], r9 movaps [rbp-0x50], xmm0 movaps [rbp-0x60], xmm1 movaps [rbp-0x70], xmm2 movaps [rbp-0x80], xmm3 movaps [rbp-0x90], xmm4 movaps [rbp-0xA0], xmm5 movaps [rbp-0xB0], xmm6 movaps [rbp-0xC0], xmm7 mov rdi, rsi call _object_getClass mov rdi, rax lea rsi, [rip+sel_forwardingTargetForSelector_] call _class_respondsToSelector test rax, rax jz 0f mov rdi, [rbp-0x18] lea rsi, [rip+sel_forwardingTargetForSelector_] call _objc_msg_lookup mov rdi, [rbp-0x18] lea rsi, [rip+sel_forwardingTargetForSelector_] mov rdx, [rbp-0x20] call rax test rax, rax jz 0f cmp rax, [rbp-0x18] je 0f mov [rbp-0x18], rax mov rdi, rax mov rsi, [rbp-0x20] call _objc_msg_lookup_stret mov r11, rax /* Restore all arguments */ movaps xmm7, [rbp-0xC0] movaps xmm6, [rbp-0xB0] movaps xmm5, [rbp-0xA0] movaps xmm4, [rbp-0x90] movaps xmm3, [rbp-0x80] movaps xmm2, [rbp-0x70] movaps xmm1, [rbp-0x60] movaps xmm0, [rbp-0x50] mov r9, [rbp-0x38] mov r8, [rbp-0x30] mov rcx, [rbp-0x28] mov rdx, [rbp-0x20] mov rsi, [rbp-0x18] mov rdi, [rbp-0x10] mov rax, [rbp-0x08] mov rsp, rbp pop rbp jmp r11 0: mov rdi, [rbp-0x10] mov rsi, [rbp-0x18] mov rdx, [rbp-0x20] mov rsp, rbp pop rbp jmp _of_method_not_found_stret init: lea rdi, [rip+module] jmp ___objc_exec_class .section __DATA, __mod_init_func, mod_init_funcs .quad init .section __TEXT, __cstring, cstring_literals str_forwardingTargetForSelector_: |
| ︙ | ︙ |
Modified src/forwarding/forwarding-x86_64-win64.S from [ec2efee322] to [b1b62864b4].
| ︙ | ︙ | |||
13 14 15 16 17 18 19 20 21 22 23 24 | * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" .globl of_forward .globl of_forward_stret .section .text of_forward: | > > | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 | * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" .intel_syntax noprefix .globl of_forward .globl of_forward_stret .section .text of_forward: push rbp mov rbp, rsp /* Save all arguments */ sub rsp, 0x90 /* 16-byte alignment */ mov [rbp-0x28], rax mov [rbp-0x30], rcx mov [rbp-0x38], rdx mov [rbp-0x40], r8 mov [rbp-0x48], r9 movaps [rbp-0x60], xmm0 movaps [rbp-0x70], xmm1 movaps [rbp-0x80], xmm2 movaps [rbp-0x90], xmm3 call object_getClass mov rcx, rax mov rdx, offset sel_forwardingTargetForSelector_ call class_respondsToSelector test rax, rax jz short 0f mov rcx, [rbp-0x30] mov rdx, offset sel_forwardingTargetForSelector_ call objc_msg_lookup mov rcx, [rbp-0x30] mov rdx, offset sel_forwardingTargetForSelector_ mov r8, [rbp-0x38] call rax test rax, rax jz short 0f cmp rax, [rbp-0x30] je short 0f mov [rbp-0x30], rax mov rcx, rax mov rdx, [rbp-0x38] call objc_msg_lookup mov r11, rax /* Restore all arguments */ movaps xmm3, [rbp-0x90] movaps xmm2, [rbp-0x80] movaps xmm1, [rbp-0x70] movaps xmm0, [rbp-0x60] mov r9, [rbp-0x48] mov r8, [rbp-0x40] mov rdx, [rbp-0x38] mov rcx, [rbp-0x30] mov rax, [rbp-0x28] mov rsp, rbp pop rbp jmp r11 0: mov rcx, [rbp-0x30] mov rdx, [rbp-0x38] mov rsp, rbp pop rbp jmp of_method_not_found of_forward_stret: push rbp mov rbp, rsp /* Save all arguments */ sub rsp, 0x90 /* 16-byte alignment */ mov [rbp-0x28], rax mov [rbp-0x30], rcx mov [rbp-0x38], rdx mov [rbp-0x40], r8 mov [rbp-0x48], r9 movaps [rbp-0x60], xmm0 movaps [rbp-0x70], xmm1 movaps [rbp-0x80], xmm2 movaps [rbp-0x90], xmm3 mov rcx, rdx call object_getClass mov rcx, rax mov rdx, offset sel_forwardingTargetForSelector_ call class_respondsToSelector test rax, rax jz short 0f mov rcx, [rbp-0x38] mov rdx, offset sel_forwardingTargetForSelector_ call objc_msg_lookup mov rcx, [rbp-0x38] mov rdx, offset sel_forwardingTargetForSelector_ mov r8, [rbp-0x40] call rax test rax, rax jz short 0f cmp rax, [rbp-0x38] je short 0f mov [rbp-0x38], rax mov rcx, rax mov rdx, [rbp-0x40] call objc_msg_lookup_stret mov r11, rax /* Restore all arguments */ movaps xmm3, [rbp-0x90] movaps xmm2, [rbp-0x80] movaps xmm1, [rbp-0x70] movaps xmm0, [rbp-0x60] mov r9, [rbp-0x48] mov r8, [rbp-0x40] mov rdx, [rbp-0x38] mov rcx, [rbp-0x30] mov rax, [rbp-0x28] mov rsp, rbp pop rbp jmp r11 0: mov rcx, [rbp-0x30] mov rdx, [rbp-0x38] mov r8, [rbp-0x40] mov rsp, rbp pop rbp jmp of_method_not_found_stret init: mov rcx, offset module jmp __objc_exec_class .section .ctors, "aw" .quad init .section .rodata str_forwardingTargetForSelector_: |
| ︙ | ︙ |
Modified src/forwarding/forwarding.S from [50662045f8] to [873a2fafd1].
| ︙ | ︙ | |||
43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 | # include "forwarding-arm-elf.S" # elif defined(OF_POWERPC) # include "forwarding-powerpc-elf.S" # elif defined(OF_MIPS) # include "forwarding-mips-elf.S" # elif defined(OF_SPARC64) # include "forwarding-sparc64-elf.S" # endif # elif defined(OF_MACH_O) # if defined(OF_X86_64) # include "forwarding-x86_64-macho.S" # endif # elif defined(OF_WINDOWS) # if defined(OF_X86_64) # include "forwarding-x86_64-win64.S" # elif defined(OF_X86) # include "forwarding-x86-win32.S" # endif # endif #endif | > > | 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 | # include "forwarding-arm-elf.S" # elif defined(OF_POWERPC) # include "forwarding-powerpc-elf.S" # elif defined(OF_MIPS) # include "forwarding-mips-elf.S" # elif defined(OF_SPARC64) # include "forwarding-sparc64-elf.S" # elif defined(OF_SPARC) # include "forwarding-sparc-elf.S" # endif # elif defined(OF_MACH_O) # if defined(OF_X86_64) # include "forwarding-x86_64-macho.S" # endif # elif defined(OF_WINDOWS) # if defined(OF_X86_64) # include "forwarding-x86_64-win64.S" # elif defined(OF_X86) # include "forwarding-x86-win32.S" # endif # endif #endif |
Modified src/macros.h from [b900515d8a] to [975aa82042].
| ︙ | ︙ | |||
304 305 306 307 308 309 310 311 312 313 314 315 316 317 | #endif #if __has_attribute(__swift_name__) # define OF_SWIFT_NAME(name) __attribute__((__swift_name__(name))) #else # define OF_SWIFT_NAME(name) #endif #ifdef __GNUC__ # ifdef OF_X86_64 # define OF_X86_64_ASM # endif # ifdef OF_X86 # define OF_X86_ASM | > > > > > > > > > > > | 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 | #endif #if __has_attribute(__swift_name__) # define OF_SWIFT_NAME(name) __attribute__((__swift_name__(name))) #else # define OF_SWIFT_NAME(name) #endif #if __has_attribute(__objc_direct__) && defined(OF_APPLE_RUNTIME) # define OF_DIRECT __attribute__((__objc_direct__)) #else # define OF_DIRECT #endif #if __has_attribute(__objc_direct_members__) && defined(OF_APPLE_RUNTIME) # define OF_DIRECT_MEMBERS __attribute__((__objc_direct_members__)) #else # define OF_DIRECT_MEMBERS #endif #ifdef __GNUC__ # ifdef OF_X86_64 # define OF_X86_64_ASM # endif # ifdef OF_X86 # define OF_X86_ASM |
| ︙ | ︙ | |||
351 352 353 354 355 356 357 |
# define OF_HAVE_FORWARDING_TARGET_FOR_SELECTOR
# define OF_HAVE_FORWARDING_TARGET_FOR_SELECTOR_STRET
# endif
#else
# if defined(OF_ELF)
# if defined(OF_X86_64) || defined(OF_X86) || \
defined(OF_ARM64) || defined(OF_ARM) || defined(OF_POWERPC) || \
| | | 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 |
# define OF_HAVE_FORWARDING_TARGET_FOR_SELECTOR
# define OF_HAVE_FORWARDING_TARGET_FOR_SELECTOR_STRET
# endif
#else
# if defined(OF_ELF)
# if defined(OF_X86_64) || defined(OF_X86) || \
defined(OF_ARM64) || defined(OF_ARM) || defined(OF_POWERPC) || \
defined(OF_MIPS) || defined(OF_SPARC64) || defined(OF_SPARC)
# define OF_HAVE_FORWARDING_TARGET_FOR_SELECTOR
# if __OBJFW_RUNTIME_ABI__ >= 800
# define OF_HAVE_FORWARDING_TARGET_FOR_SELECTOR_STRET
# endif
# endif
# elif defined(OF_MACH_O)
# if defined(OF_X86_64)
|
| ︙ | ︙ |
Modified src/pbkdf2.h from [f610170817] to [ca3cc52cca].
| ︙ | ︙ | |||
26 27 28 29 30 31 32 33 34 35 36 |
OF_ASSUME_NONNULL_BEGIN
/*! @file */
@class OFHMAC;
#ifdef __cplusplus
extern "C" {
#endif
/*!
| > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | | | < < < < < | < < < < < | < < < | 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 |
OF_ASSUME_NONNULL_BEGIN
/*! @file */
@class OFHMAC;
/*!
* @brief The parameters for @ref of_pbkdf2.
*/
typedef struct of_pbkdf2_parameters_t {
/*! @brief The HMAC to use to derive a key. */
OFHMAC *HMAC;
/*! @brief The number of iterations to perform. */
size_t iterations;
/*! @brief The salt to derive a key with. */
const unsigned char *salt;
/*! @brief The length of the salt. */
size_t saltLength;
/*! @brief The password to derive a key from. */
const char *password;
/*! @brief The length of the password. */
size_t passwordLength;
/*! @brief The buffer to write the key to. */
unsigned char *key;
/*!
* @brief The desired length for the derived key.
*
* @ref key needs to have enough storage.
*/
size_t keyLength;
/*! @brief Whether data may be stored in swappable memory. */
bool allowsSwappableMemory;
} of_pbkdf2_parameters_t;
#ifdef __cplusplus
extern "C" {
#endif
/*!
* @brief Derives a key from a password and a salt using PBKDF2.
*
* @note This will call @ref OFHMAC::reset on the `HMAC` first, making it
* possible to reuse the `HMAC`, but also meaning all previous results
* from the `HMAC` get invalidated if they have not been copied.
*
* @param param The parameters to use
*/
extern void of_pbkdf2(of_pbkdf2_parameters_t param);
#ifdef __cplusplus
}
#endif
OF_ASSUME_NONNULL_END
|
Modified src/pbkdf2.m from [7bd85babf9] to [ae8f98e1e6].
| ︙ | ︙ | |||
24 25 26 27 28 29 30 | #import "OFInvalidArgumentException.h" #import "OFOutOfMemoryException.h" #import "OFOutOfRangeException.h" #import "pbkdf2.h" | > | < < < | | | | | | | | | > | | | | | | | | | | | | | | | | > | | | | | | | 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 |
#import "OFInvalidArgumentException.h"
#import "OFOutOfMemoryException.h"
#import "OFOutOfRangeException.h"
#import "pbkdf2.h"
void
of_pbkdf2(of_pbkdf2_parameters_t param)
{
void *pool = objc_autoreleasePoolPush();
size_t blocks, digestSize = param.HMAC.digestSize;
OFSecureData *buffer = [OFSecureData
dataWithCount: digestSize
allowsSwappableMemory: param.allowsSwappableMemory];
OFSecureData *digest = [OFSecureData
dataWithCount: digestSize
allowsSwappableMemory: param.allowsSwappableMemory];
unsigned char *bufferItems = buffer.mutableItems;
unsigned char *digestItems = digest.mutableItems;
OFSecureData *extendedSalt;
unsigned char *extendedSaltItems;
if (param.HMAC == nil || param.iterations == 0 || param.salt == NULL ||
param.password == NULL || param.key == NULL || param.keyLength == 0)
@throw [OFInvalidArgumentException exception];
blocks = param.keyLength / digestSize;
if (param.keyLength % digestSize != 0)
blocks++;
if (param.saltLength > SIZE_MAX - 4 || blocks > UINT32_MAX)
@throw [OFOutOfRangeException exception];
extendedSalt = [OFSecureData
dataWithCount: param.saltLength + 4
allowsSwappableMemory: param.allowsSwappableMemory];
extendedSaltItems = extendedSalt.mutableItems;
@try {
uint32_t i = OF_BSWAP32_IF_LE(1);
[param.HMAC setKey: param.password
length: param.passwordLength];
memcpy(extendedSaltItems, param.salt, param.saltLength);
while (param.keyLength > 0) {
size_t length;
memcpy(extendedSaltItems + param.saltLength, &i, 4);
[param.HMAC reset];
[param.HMAC updateWithBuffer: extendedSaltItems
length: param.saltLength + 4];
memcpy(bufferItems, param.HMAC.digest, digestSize);
memcpy(digestItems, param.HMAC.digest, digestSize);
for (size_t j = 1; j < param.iterations; j++) {
[param.HMAC reset];
[param.HMAC updateWithBuffer: digestItems
length: digestSize];
memcpy(digestItems, param.HMAC.digest,
digestSize);
for (size_t k = 0; k < digestSize; k++)
bufferItems[k] ^= digestItems[k];
}
length = digestSize;
if (length > param.keyLength)
length = param.keyLength;
memcpy(param.key, bufferItems, length);
param.key += length;
param.keyLength -= length;
i = OF_BSWAP32_IF_LE(OF_BSWAP32_IF_LE(i) + 1);
}
} @catch (id e) {
[extendedSalt zero];
[buffer zero];
[digest zero];
@throw e;
} @finally {
[param.HMAC zero];
}
objc_autoreleasePoolPop(pool);
}
|
Modified src/platform/amiga/thread.m from [7b264a994b] to [de7e15e20a].
| ︙ | ︙ | |||
164 165 166 167 168 169 170 |
return of_tlskey_get(threadKey);
}
bool
of_thread_join(of_thread_t thread)
{
ObtainSemaphore(&thread->semaphore);
| | | > > | | | > | 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 |
return of_tlskey_get(threadKey);
}
bool
of_thread_join(of_thread_t thread)
{
ObtainSemaphore(&thread->semaphore);
if (thread->done) {
ReleaseSemaphore(&thread->semaphore);
free(thread);
return true;
}
@try {
if (thread->detached || thread->joinTask != NULL) {
errno = EINVAL;
return false;
}
if ((thread->joinSigBit = AllocSignal(-1)) == -1) {
errno = EAGAIN;
|
| ︙ | ︙ |
Modified src/platform/windows/thread.m from [890723e850] to [d3d9eb9ec8].
| ︙ | ︙ | |||
19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 |
#include <errno.h>
#import "thread.h"
#import "macros.h"
#include <windows.h>
bool
of_thread_attr_init(of_thread_attr_t *attr)
{
attr->priority = 0;
attr->stackSize = 0;
return true;
}
bool
of_thread_new(of_thread_t *thread, const char *name, void (*function)(id),
id object, const of_thread_attr_t *attr)
{
| > > > > > > > > > > > > > < | | | < < < < < < < < < | < < < < | > > > > > > > > > > > > > > > > > > > > > > > | | > > > > > > > > | 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 |
#include <errno.h>
#import "thread.h"
#import "macros.h"
#include <windows.h>
struct thread_context {
void (*function)(id);
id object;
};
static WINAPI void
functionWrapper(struct thread_context *context)
{
context->function(context->object);
free(context);
}
bool
of_thread_attr_init(of_thread_attr_t *attr)
{
attr->priority = 0;
attr->stackSize = 0;
return true;
}
bool
of_thread_new(of_thread_t *thread, const char *name, void (*function)(id),
id object, const of_thread_attr_t *attr)
{
DWORD priority = THREAD_PRIORITY_NORMAL;
struct thread_context *context;
DWORD threadID;
if (attr != NULL && attr->priority != 0) {
if (attr->priority < -1 || attr->priority > 1) {
errno = EINVAL;
return false;
}
if (attr->priority < 0)
priority = THREAD_PRIORITY_LOWEST +
(1.0 + attr->priority) *
(THREAD_PRIORITY_NORMAL - THREAD_PRIORITY_LOWEST);
else
priority = THREAD_PRIORITY_NORMAL +
attr->priority *
(THREAD_PRIORITY_HIGHEST - THREAD_PRIORITY_NORMAL);
}
if ((context = malloc(sizeof(*context))) == NULL) {
errno = ENOMEM;
return false;
}
context->function = function;
context->object = object;
*thread = CreateThread(NULL, (attr != NULL ? attr->stackSize : 0),
(LPTHREAD_START_ROUTINE)functionWrapper, context, 0, &threadID);
if (thread == NULL) {
int errNo;
switch (GetLastError()) {
case ERROR_NOT_ENOUGH_MEMORY:
errNo = ENOMEM;
break;
case ERROR_ACCESS_DENIED:
errNo = EACCES;
break;
default:
OF_ENSURE(0);
}
free(context);
errno = errNo;
return false;
}
if (attr != NULL && attr->priority != 0)
OF_ENSURE(!SetThreadPriority(*thread, priority));
return true;
}
bool
of_thread_join(of_thread_t thread)
{
switch (WaitForSingleObject(thread, INFINITE)) {
|
| ︙ | ︙ |
Modified src/runtime/exception.m from [61beb93dab] to [ff0a7a161b].
| ︙ | ︙ | |||
750 751 752 753 754 755 756 |
OBJC_ERROR("Not enough memory to allocate exception!")
e->exception.class = GNUCOBJC_EXCEPTION_CLASS;
e->exception.cleanup = (emergency
? emergencyExceptionCleanup : cleanup);
e->object = object;
| | > | | 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 |
OBJC_ERROR("Not enough memory to allocate exception!")
e->exception.class = GNUCOBJC_EXCEPTION_CLASS;
e->exception.cleanup = (emergency
? emergencyExceptionCleanup : cleanup);
e->object = object;
_Unwind_RaiseException(&e->exception);
if (uncaughtExceptionHandler != NULL)
uncaughtExceptionHandler(object);
OBJC_ERROR("_Unwind_RaiseException() returned!")
}
objc_uncaught_exception_handler_t
objc_setUncaughtExceptionHandler(objc_uncaught_exception_handler_t handler)
|
| ︙ | ︙ |
Modified src/runtime/lookup-asm/lookup-asm-sparc-elf.S from [16219ec5cd] to [3c80564f3f].
| ︙ | ︙ | |||
50 51 52 53 54 55 56 | #ifdef OF_SELUID24 ld [%o2 + %o3], %o2 #endif ld [%o2 + %o4], %o2 ld [%o2 + %o5], %o2 cmp %o2, 0 | | > > > > > | 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 | #ifdef OF_SELUID24 ld [%o2 + %o3], %o2 #endif ld [%o2 + %o4], %o2 ld [%o2 + %o5], %o2 cmp %o2, 0 be 0f nop retl mov %o2, %o0 0: mov %o7, %g1 call \not_found mov %g1, %o7 .type \name, %function .size \name, .-\name .endm .macro generate_lookup_super name lookup \name: mov %o0, %o2 |
| ︙ | ︙ |
Modified src/runtime/lookup-asm/lookup-asm-x86-elf.S from [6c4a8f6d7c] to [582b619bd5].
| ︙ | ︙ | |||
15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 | * file. */ #include "config.h" #include "platform.h" .globl objc_msg_lookup .globl objc_msg_lookup_stret .globl objc_msg_lookup_super .globl objc_msg_lookup_super_stret .section .text .macro generate_lookup name not_found \name: | > > | | | | | | | | | | | | | | < | | | | | | | | | | | < > | | | | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 | * file. */ #include "config.h" #include "platform.h" .intel_syntax noprefix .globl objc_msg_lookup .globl objc_msg_lookup_stret .globl objc_msg_lookup_super .globl objc_msg_lookup_super_stret .section .text .macro generate_lookup name not_found \name: mov edx, [esp+4] test edx, edx jz short ret_nil mov edx, [edx] mov edx, [edx+32] .Lmain_\name: mov eax, [esp+8] #ifdef OF_SELUID24 movzx ecx, byte ptr [eax+2] mov edx, [edx+ecx*4] #endif movzx ecx, byte ptr [eax+1] mov edx, [edx+ecx*4] movzx ecx, byte ptr [eax] mov eax, [edx+ecx*4] test eax, eax jz short 0f ret 0: call get_eip add eax, offset _GLOBAL_OFFSET_TABLE_ lea eax, [eax+\not_found@GOTOFF] jmp eax .type \name, %function .size \name, .-\name .endm .macro generate_lookup_super name lookup \name: mov edx, [esp+4] mov eax, [edx] test eax, eax jz short ret_nil mov [esp+4], eax mov edx, [edx+4] mov edx, [edx+32] jmp short .Lmain_\lookup .type \name, %function .size \name, .-\name .endm generate_lookup objc_msg_lookup objc_method_not_found generate_lookup objc_msg_lookup_stret objc_method_not_found_stret generate_lookup_super objc_msg_lookup_super objc_msg_lookup generate_lookup_super objc_msg_lookup_super_stret objc_msg_lookup_stret ret_nil: call get_eip add eax, offset _GLOBAL_OFFSET_TABLE_ lea eax, [eax+nil_method@GOTOFF] ret nil_method: xor eax, eax ret get_eip: mov eax, [esp] ret #ifdef OF_LINUX .section .note.GNU-stack, "", %progbits #endif |
Modified src/runtime/lookup-asm/lookup-asm-x86-win32.S from [4aa81a0136] to [44cfb2c923].
| ︙ | ︙ | |||
12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 | * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" .globl _objc_msg_lookup .globl _objc_msg_lookup_stret .globl _objc_msg_lookup_super .globl _objc_msg_lookup_super_stret .section .text .macro generate_lookup name not_found \name: | > > | | | | | | | | | | | | | | < < | < | | | | | | | | < < | | < < < < | 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 | * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" .intel_syntax noprefix .globl _objc_msg_lookup .globl _objc_msg_lookup_stret .globl _objc_msg_lookup_super .globl _objc_msg_lookup_super_stret .section .text .macro generate_lookup name not_found \name: mov edx, [esp+4] test edx, edx jz short ret_nil mov edx, [edx] mov edx, [edx+32] .Lmain_\name: mov eax, [esp+8] #ifdef OF_SELUID24 movzx ecx, byte ptr [eax+2] mov edx, [edx+ecx*4] #endif movzx ecx, byte ptr [eax+1] mov edx, [edx+ecx*4] movzx ecx, byte ptr [eax] mov eax, [edx+ecx*4] test eax, eax jz short 0f ret 0: jmp \not_found .endm .macro generate_lookup_super name lookup \name: mov edx, [esp+4] mov eax, [edx] test eax, eax jz short ret_nil mov [esp+4], eax mov edx, [edx+4] mov edx, [edx+32] jmp short .Lmain_\lookup .endm generate_lookup _objc_msg_lookup _objc_method_not_found generate_lookup _objc_msg_lookup_stret _objc_method_not_found_stret generate_lookup_super _objc_msg_lookup_super _objc_msg_lookup generate_lookup_super _objc_msg_lookup_super_stret _objc_msg_lookup_stret ret_nil: mov eax, offset nil_method ret nil_method: xor eax, eax ret |
Modified src/runtime/lookup-asm/lookup-asm-x86_64-elf.S from [16edfd651f] to [d030c5228c].
| ︙ | ︙ | |||
15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 | * file. */ #include "config.h" #include "platform.h" .globl objc_msg_lookup .globl objc_msg_lookup_stret .globl objc_msg_lookup_super .globl objc_msg_lookup_super_stret .section .text .macro generate_lookup name not_found \name: | > > | | | | | | | | | | | | | | | | | | | | | | | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 | * file. */ #include "config.h" #include "platform.h" .intel_syntax noprefix .globl objc_msg_lookup .globl objc_msg_lookup_stret .globl objc_msg_lookup_super .globl objc_msg_lookup_super_stret .section .text .macro generate_lookup name not_found \name: test rdi, rdi jz short ret_nil mov r8, [rdi] mov r8, [r8+64] .Lmain_\name: mov rax, [rsi] movzx ecx, ah movzx edx, al #ifdef OF_SELUID24 shr eax, 16 mov r8, [r8+rax*8] #endif mov r8, [r8+rcx*8] mov rax, [r8+rdx*8] test rax, rax jz short \not_found@PLT ret .type \name, %function .size \name, .-\name .endm .macro generate_lookup_super name lookup \name: mov r8, rdi mov rdi, [rdi] test rdi, rdi jz short ret_nil mov r8, [r8+8] mov r8, [r8+64] jmp short .Lmain_\lookup .type \name, %function .size \name, .-\name .endm generate_lookup objc_msg_lookup objc_method_not_found generate_lookup objc_msg_lookup_stret objc_method_not_found_stret generate_lookup_super objc_msg_lookup_super objc_msg_lookup generate_lookup_super objc_msg_lookup_super_stret objc_msg_lookup_stret ret_nil: lea rax, [rip+nil_method] ret nil_method: xor rax, rax ret #ifdef OF_LINUX .section .note.GNU-stack, "", %progbits #endif |
Modified src/runtime/lookup-asm/lookup-asm-x86_64-macho.S from [31f7e82d2f] to [679535bcad].
| ︙ | ︙ | |||
12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 | * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" .globl _objc_msg_lookup .globl _objc_msg_lookup_stret .globl _objc_msg_lookup_super .globl _objc_msg_lookup_super_stret .section __TEXT, __text, regular, pure_instructions .macro generate_lookup $0: | > > | | | | | | | | | | | | | | | | | | | 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 | * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" .intel_syntax noprefix .globl _objc_msg_lookup .globl _objc_msg_lookup_stret .globl _objc_msg_lookup_super .globl _objc_msg_lookup_super_stret .section __TEXT, __text, regular, pure_instructions .macro generate_lookup $0: test rdi, rdi jz ret_nil mov r8, [rdi] mov r8, [r8+64] Lmain_$0: mov rax, [rsi] movzx ecx, ah movzx edx, al #ifdef OF_SELUID24 shr eax, 16 mov r8, [r8+rax*8] #endif mov r8, [r8+rcx*8] mov rax, [r8+rdx*8] test rax, rax jz $1 ret .endmacro .macro generate_lookup_super $0: mov r8, rdi mov rdi, [rdi] test rdi, rdi jz ret_nil mov r8, [r8+8] mov r8, [r8+64] jmp Lmain_$1 .endmacro generate_lookup _objc_msg_lookup, _objc_method_not_found generate_lookup _objc_msg_lookup_stret, _objc_method_not_found_stret generate_lookup_super _objc_msg_lookup_super, _objc_msg_lookup generate_lookup_super _objc_msg_lookup_super_stret, _objc_msg_lookup_stret ret_nil: lea rax, [rip+nil_method] ret nil_method: mov rax, rdi ret |
Modified src/runtime/lookup-asm/lookup-asm-x86_64-win64.S from [71fe436f5b] to [47f8ccf7d6].
| ︙ | ︙ | |||
13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 | * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" .globl objc_msg_lookup .globl objc_msg_lookup_stret .globl objc_msg_lookup_super .globl objc_msg_lookup_super_stret .section .text .macro generate_lookup name not_found \name: | > > | | | | | | | | | | | | | | | | | | | | | | | | | | | 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 | * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" .intel_syntax noprefix .globl objc_msg_lookup .globl objc_msg_lookup_stret .globl objc_msg_lookup_super .globl objc_msg_lookup_super_stret .section .text .macro generate_lookup name not_found \name: test %rcx, %rcx jz short ret_nil mov r8, [rcx] mov r8, [r8+56] .Lmain_\name: mov r10, rcx mov r11, rdx mov rax, [rdx] movzx ecx, ah movzx edx, al #ifdef OF_SELUID24 shr eax, 16 mov r8, [r8+rax*8] #endif mov r8, [r8+rcx*8] mov rax, [r8+rdx*8] test rax, rax jz short 0f ret 0: mov rcx, r10 mov rdx, r11 jmp \not_found .endm .macro generate_lookup_super name lookup \name: mov r8, rcx mov rcx, [rcx] test rcx, rcx jz short ret_nil mov r8, [r8+8] mov r8, [r8+56] jmp short .Lmain_\lookup .endm generate_lookup objc_msg_lookup objc_method_not_found generate_lookup objc_msg_lookup_stret objc_method_not_found_stret generate_lookup_super objc_msg_lookup_super objc_msg_lookup generate_lookup_super objc_msg_lookup_super_stret objc_msg_lookup_stret ret_nil: mov rax, offset nil_method ret nil_method: xor rax, rax ret |
Modified src/scrypt.h from [aaee93f1b6] to [2a97d56e0e].
| ︙ | ︙ | |||
26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 |
OF_ASSUME_NONNULL_BEGIN
/*! @file */
@class OFHMAC;
#ifdef __cplusplus
extern "C" {
#endif
extern void of_salsa20_8_core(uint32_t buffer[_Nonnull 16]);
extern void of_scrypt_block_mix(uint32_t *output, const uint32_t *input,
size_t blockSize);
extern void of_scrypt_romix(uint32_t *buffer, size_t blockSize,
size_t costFactor, uint32_t *tmp);
| > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | | < > > > > | 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 |
OF_ASSUME_NONNULL_BEGIN
/*! @file */
@class OFHMAC;
/*!
* @brief The parameters for @ref of_scrypt.
*/
typedef struct of_scrypt_parameters_t {
/*! @brief The block size to use. */
size_t blockSize;
/*! @brief The CPU/memory cost factor to use. */
size_t costFactor;
/*! @brief The parallelization to use. */
size_t parallelization;
/*! @brief The salt to derive a key with. */
const unsigned char *salt;
/*! @brief The length of the salt. */
size_t saltLength;
/*! @brief The password to derive a key from. */
const char *password;
/*! @brief The length of the password. */
size_t passwordLength;
/*! @brief The buffer to write the key to. */
unsigned char *key;
/*!
* @brief The desired length for the derived key.
*
* @ref key needs to have enough storage.
*/
size_t keyLength;
/*! @brief Whether data may be stored in swappable memory. */
bool allowsSwappableMemory;
} of_scrypt_parameters_t;
#ifdef __cplusplus
extern "C" {
#endif
extern void of_salsa20_8_core(uint32_t buffer[_Nonnull 16]);
extern void of_scrypt_block_mix(uint32_t *output, const uint32_t *input,
size_t blockSize);
extern void of_scrypt_romix(uint32_t *buffer, size_t blockSize,
size_t costFactor, uint32_t *tmp);
/*!
* @brief Derives a key from a password and a salt using scrypt.
*
* @param param The parameters to use
*/
extern void of_scrypt(of_scrypt_parameters_t param);
#ifdef __cplusplus
}
#endif
OF_ASSUME_NONNULL_END
|
Modified src/scrypt.m from [bf0f4f5521] to [163ddcc8f1].
| ︙ | ︙ | |||
81 82 83 84 85 86 87 |
void
of_scrypt_block_mix(uint32_t *output, const uint32_t *input, size_t blockSize)
{
uint32_t tmp[16];
/* Check defined here and executed in of_scrypt() */
#define OVERFLOW_CHECK_1 \
| | | | 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 |
void
of_scrypt_block_mix(uint32_t *output, const uint32_t *input, size_t blockSize)
{
uint32_t tmp[16];
/* Check defined here and executed in of_scrypt() */
#define OVERFLOW_CHECK_1 \
if (param.blockSize > SIZE_MAX / 2 || \
2 * param.blockSize - 1 > SIZE_MAX / 16) \
@throw [OFOutOfRangeException exception];
memcpy(tmp, input + (2 * blockSize - 1) * 16, 64);
for (size_t i = 0; i < 2 * blockSize; i++) {
for (size_t j = 0; j < 16; j++)
tmp[j] ^= input[i * 16 + j];
|
| ︙ | ︙ | |||
108 109 110 111 112 113 114 |
}
void
of_scrypt_romix(uint32_t *buffer, size_t blockSize, size_t costFactor,
uint32_t *tmp)
{
/* Check defined here and executed in of_scrypt() */
| | | | 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 |
}
void
of_scrypt_romix(uint32_t *buffer, size_t blockSize, size_t costFactor,
uint32_t *tmp)
{
/* Check defined here and executed in of_scrypt() */
#define OVERFLOW_CHECK_2 \
if (param.blockSize > SIZE_MAX / 128 / param.costFactor) \
@throw [OFOutOfRangeException exception];
uint32_t *tmp2 = tmp + 32 * blockSize;
memcpy(tmp, buffer, 128 * blockSize);
for (size_t i = 0; i < costFactor; i++) {
|
| ︙ | ︙ | |||
135 136 137 138 139 140 141 | of_scrypt_block_mix(buffer, tmp, blockSize); if (i < costFactor - 1) memcpy(tmp, buffer, 128 * blockSize); } } | | | < < | > | | | | | | | | | | | > > > > > > | | | > > > | | | > > > | | > > > > > | > | 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 |
of_scrypt_block_mix(buffer, tmp, blockSize);
if (i < costFactor - 1)
memcpy(tmp, buffer, 128 * blockSize);
}
}
void
of_scrypt(of_scrypt_parameters_t param)
{
OFSecureData *tmp = nil, *buffer = nil;
OFHMAC *HMAC = nil;
if (param.blockSize == 0 || param.costFactor <= 1 ||
(param.costFactor & (param.costFactor - 1)) != 0 ||
param.parallelization == 0)
@throw [OFInvalidArgumentException exception];
/*
* These are defined by the functions above. They are defined there so
* that the check is next to the code and easy to verify, but actually
* checked here for performance.
*/
OVERFLOW_CHECK_1
OVERFLOW_CHECK_2
@try {
uint32_t *tmpItems, *bufferItems;
if (param.costFactor > SIZE_MAX - 1 ||
(param.costFactor + 1) > SIZE_MAX / 128)
@throw [OFOutOfRangeException exception];
tmp = [[OFSecureData alloc]
initWithItemSize: param.blockSize
count: (param.costFactor + 1) * 128
allowsSwappableMemory: param.allowsSwappableMemory];
tmpItems = tmp.mutableItems;
if (param.parallelization > SIZE_MAX / 128)
@throw [OFOutOfRangeException exception];
buffer = [[OFSecureData alloc]
initWithItemSize: param.blockSize
count: param.parallelization * 128
allowsSwappableMemory: param.allowsSwappableMemory];
bufferItems = buffer.mutableItems;
HMAC = [[OFHMAC alloc]
initWithHashClass: [OFSHA256Hash class]
allowsSwappableMemory: param.allowsSwappableMemory];
of_pbkdf2((of_pbkdf2_parameters_t){
.HMAC = HMAC,
.iterations = 1,
.salt = param.salt,
.saltLength = param.saltLength,
.password = param.password,
.passwordLength = param.passwordLength,
.key = (unsigned char *)bufferItems,
.keyLength = param.parallelization * 128 *
param.blockSize,
.allowsSwappableMemory = param.allowsSwappableMemory
});
for (size_t i = 0; i < param.parallelization; i++)
of_scrypt_romix(bufferItems + i * 32 * param.blockSize,
param.blockSize, param.costFactor, tmpItems);
of_pbkdf2((of_pbkdf2_parameters_t){
.HMAC = HMAC,
.iterations = 1,
.salt = (unsigned char *)bufferItems,
.saltLength = param.parallelization * 128 *
param.blockSize,
.password = param.password,
.passwordLength = param.passwordLength,
.key = param.key,
.keyLength = param.keyLength,
.allowsSwappableMemory = param.allowsSwappableMemory
});
} @finally {
[tmp release];
[buffer release];
[HMAC release];
}
}
|
Modified tests/Makefile from [2e772fca3c] to [507e78a489].
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 |
include ../extra.mk
SUBDIRS = ${TESTPLUGIN}
CLEAN = EBOOT.PBP \
boot.dol \
${PROG_NOINST}.arm9 \
${PROG_NOINST}.nds
PROG_NOINST = tests${PROG_SUFFIX}
STATIC_LIB_NOINST = ${TESTS_STATIC_LIB}
SRCS = ForwardingTests.m \
OFArrayTests.m \
${OF_BLOCK_TESTS_M} \
OFCharacterSetTests.m \
| > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 |
include ../extra.mk
SUBDIRS = ${TESTPLUGIN}
CLEAN = EBOOT.PBP \
boot.dol \
${PROG_NOINST}.arm9 \
${PROG_NOINST}.nds
DISTCLEAN = Info.plist
PROG_NOINST = tests${PROG_SUFFIX}
STATIC_LIB_NOINST = ${TESTS_STATIC_LIB}
SRCS = ForwardingTests.m \
OFArrayTests.m \
${OF_BLOCK_TESTS_M} \
OFCharacterSetTests.m \
|
| ︙ | ︙ |
Modified tests/OFDNSResolverTests.m from [8f7194537b] to [56b8d9d248].
| ︙ | ︙ | |||
15 16 17 18 19 20 21 | * file. */ #include "config.h" #import "TestsAppDelegate.h" | < < | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 |
* file.
*/
#include "config.h"
#import "TestsAppDelegate.h"
@implementation TestsAppDelegate (OFDNSResolverTests)
- (void)DNSResolverTests
{
void *pool = objc_autoreleasePoolPush();
OFDNSResolver *resolver = [OFDNSResolver resolver];
OFMutableString *staticHosts = [OFMutableString string];
|
| ︙ | ︙ | |||
60 61 62 63 64 65 66 | resolver.maxAttempts]; [of_stdout writeFormat: @"[OFDNSResolver] Min number of dots in absolute name: %u\n", resolver.minNumberOfDotsInAbsoluteName]; [of_stdout writeFormat: @"[OFDNSResolver] Uses TCP: %u\n", | | | 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 | resolver.maxAttempts]; [of_stdout writeFormat: @"[OFDNSResolver] Min number of dots in absolute name: %u\n", resolver.minNumberOfDotsInAbsoluteName]; [of_stdout writeFormat: @"[OFDNSResolver] Uses TCP: %u\n", resolver.usesTCP]; [of_stdout writeFormat: @"[OFDNSResolver] Config reload interval: %lf\n", resolver.configReloadInterval]; objc_autoreleasePoolPop(pool); } @end |
Modified tests/OFLocaleTests.m from [bba7d2e3cd] to [9e55bec70d].
| ︙ | ︙ | |||
22 23 24 25 26 27 28 |
@implementation TestsAppDelegate (OFLocaleTests)
- (void)localeTests
{
void *pool = objc_autoreleasePoolPush();
of_stdout.foregroundColor = [OFColor lime];
| | | | | | 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 |
@implementation TestsAppDelegate (OFLocaleTests)
- (void)localeTests
{
void *pool = objc_autoreleasePoolPush();
of_stdout.foregroundColor = [OFColor lime];
[of_stdout writeFormat: @"[OFLocale] Language: %@\n",
[OFLocale language]];
[of_stdout writeFormat: @"[OFLocale] Territory: %@\n",
[OFLocale territory]];
[of_stdout writeFormat: @"[OFLocale] Encoding: %@\n",
of_string_name_of_encoding([OFLocale encoding])];
[of_stdout writeFormat: @"[OFLocale] Decimal point: %@\n",
[OFLocale decimalPoint]];
objc_autoreleasePoolPop(pool);
}
@end
|
Modified tests/OFSPXSocketTests.m from [6d42db054f] to [0285d3399d].
| ︙ | ︙ | |||
161 162 163 164 165 166 167 | of_socket_address_get_ipx_node(&address1, node); memcpy(delegate->_expectedNode, node, IPX_NODE_LEN); delegate->_expectedNetwork = network = of_socket_address_get_ipx_network(&address1); delegate->_expectedPort = port = of_socket_address_get_port(&address1); | > | | | | | | | > > > > > > > > > > > | > > | 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 |
of_socket_address_get_ipx_node(&address1, node);
memcpy(delegate->_expectedNode, node, IPX_NODE_LEN);
delegate->_expectedNetwork = network =
of_socket_address_get_ipx_network(&address1);
delegate->_expectedPort = port = of_socket_address_get_port(&address1);
@try {
[sockClient asyncConnectToNode: node
network: network
port: port];
[[OFRunLoop mainRunLoop] runUntilDate:
[OFDate dateWithTimeIntervalSinceNow: 2]];
TEST(@"-[asyncAccept] & -[asyncConnectToNode:network:port:]",
delegate->_accepted && delegate->_connected)
} @catch (OFObserveFailedException *e) {
switch (e.errNo) {
case ENOTSOCK:
of_stdout.foregroundColor = [OFColor lime];
[of_stdout writeLine:
@"[OFSPXSocket] -[asyncAccept] & "
@"-[asyncConnectToNode:network:port:]: select() "
@"not supported for SPX, skipping test"];
break;
default:
@throw e;
}
}
objc_autoreleasePoolPop(pool);
}
@end
|
Modified tests/OFSPXStreamSocketTests.m from [c4c06acd4d] to [897f2e1598].
| ︙ | ︙ | |||
165 166 167 168 169 170 171 | of_socket_address_get_ipx_node(&address1, node); memcpy(delegate->_expectedNode, node, IPX_NODE_LEN); delegate->_expectedNetwork = network = of_socket_address_get_ipx_network(&address1); delegate->_expectedPort = port = of_socket_address_get_port(&address1); | > | | | | | | | > > > > > > > > > > > | > > | 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 |
of_socket_address_get_ipx_node(&address1, node);
memcpy(delegate->_expectedNode, node, IPX_NODE_LEN);
delegate->_expectedNetwork = network =
of_socket_address_get_ipx_network(&address1);
delegate->_expectedPort = port = of_socket_address_get_port(&address1);
@try {
[sockClient asyncConnectToNode: node
network: network
port: port];
[[OFRunLoop mainRunLoop] runUntilDate:
[OFDate dateWithTimeIntervalSinceNow: 2]];
TEST(@"-[asyncAccept] & -[asyncConnectToNode:network:port:]",
delegate->_accepted && delegate->_connected)
} @catch (OFObserveFailedException *e) {
switch (e.errNo) {
case ENOTSOCK:
of_stdout.foregroundColor = [OFColor lime];
[of_stdout writeLine:
@"[OFSPXStreamSocket] -[asyncAccept] & "
@"-[asyncConnectToNode:network:port:]: select() "
@"not supported for SPX, skipping test"];
break;
default:
@throw e;
}
}
objc_autoreleasePoolPop(pool);
}
@end
|
Modified tests/PBKDF2Tests.m from [ce7ed4d1cb] to [1bccd3d759].
| ︙ | ︙ | |||
30 31 32 33 34 35 36 | OFHMAC *HMAC = [OFHMAC HMACWithHashClass: [OFSHA1Hash class] allowsSwappableMemory: true]; unsigned char key[25]; /* Test vectors from RFC 6070 */ TEST(@"PBKDF2-SHA1, 1 iteration", | > > > | > > > > > | | | > > > | > > > > > | | | > > > | > > > > > | | | > > > | > > > | > > | | | > > | > > | > > > > > | > > > | > > > | > > | | | 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 |
OFHMAC *HMAC = [OFHMAC HMACWithHashClass: [OFSHA1Hash class]
allowsSwappableMemory: true];
unsigned char key[25];
/* Test vectors from RFC 6070 */
TEST(@"PBKDF2-SHA1, 1 iteration",
R(of_pbkdf2((of_pbkdf2_parameters_t){
.HMAC = HMAC,
.iterations = 1,
.salt = (unsigned char *)"salt",
.saltLength = 4,
.password = "password",
.passwordLength = 8,
.key = key,
.keyLength = 20,
.allowsSwappableMemory = true
})) && memcmp(key, "\x0C\x60\xC8\x0F\x96\x1F\x0E\x71\xF3\xA9\xB5"
"\x24\xAF\x60\x12\x06\x2F\xE0\x37\xA6", 20) == 0)
TEST(@"PBKDF2-SHA1, 2 iterations",
R(of_pbkdf2((of_pbkdf2_parameters_t){
.HMAC = HMAC,
.iterations = 2,
.salt = (unsigned char *)"salt",
.saltLength = 4,
.password = "password",
.passwordLength = 8,
.key = key,
.keyLength = 20,
.allowsSwappableMemory = true
})) && memcmp(key, "\xEA\x6C\x01\x4D\xC7\x2D\x6F\x8C\xCD\x1E\xD9"
"\x2A\xCE\x1D\x41\xF0\xD8\xDE\x89\x57", 20) == 0)
TEST(@"PBKDF2-SHA1, 4096 iterations",
R(of_pbkdf2((of_pbkdf2_parameters_t){
.HMAC = HMAC,
.iterations = 4096,
.salt = (unsigned char *)"salt",
.saltLength = 4,
.password = "password",
.passwordLength = 8,
.key = key,
.keyLength = 20,
.allowsSwappableMemory = true
})) && memcmp(key, "\x4B\x00\x79\x01\xB7\x65\x48\x9A\xBE\xAD\x49"
"\xD9\x26\xF7\x21\xD0\x65\xA4\x29\xC1", 20) == 0)
/* This test takes too long, even on a fast machine. */
#if 0
TEST(@"PBKDF2-SHA1, 16777216 iterations",
R(of_pbkdf2((of_pbkdf2_parameters_t){
.HMAC = HMAC,
.iterations = 16777216,
.salt = (unsigned char *)"salt",
.saltLength = 4,
.password = "password",
.passwordLength = 8,
.key = key,
.keyLength = 20,
.allowsSwappableMemory = true
})) && memcmp(key, "\xEE\xFE\x3D\x61\xCD\x4D\xA4\xE4\xE9\x94\x5B"
"\x3D\x6B\xA2\x15\x8C\x26\x34\xE9\x84", 20) == 0)
#endif
TEST(@"PBKDF2-SHA1, 4096 iterations, key > 1 block",
R(of_pbkdf2((of_pbkdf2_parameters_t){
.HMAC = HMAC,
.iterations = 4096,
.salt = (unsigned char *)"saltSALTsaltSALTsalt"
"SALTsaltSALTsalt",
.saltLength = 36,
.password = "passwordPASSWORDpassword",
.passwordLength = 24,
.key = key,
.keyLength = 25,
.allowsSwappableMemory = true
})) &&
memcmp(key, "\x3D\x2E\xEC\x4F\xE4\x1C\x84\x9B\x80\xC8\xD8\x36\x62"
"\xC0\xE4\x4A\x8B\x29\x1A\x96\x4C\xF2\xF0\x70\x38", 25) == 0)
TEST(@"PBKDF2-SHA1, 4096 iterations, key < 1 block",
R(of_pbkdf2((of_pbkdf2_parameters_t){
.HMAC = HMAC,
.iterations = 4096,
.salt = (unsigned char *)"sa\0lt",
.saltLength = 5,
.password = "pass\0word",
.passwordLength = 9,
.key = key,
.keyLength = 16,
.allowsSwappableMemory = true
})) && memcmp(key, "\x56\xFA\x6A\xA7\x55\x48\x09\x9D\xCC\x37\xD7"
"\xF0\x34\x25\xE0\xC3", 16) == 0)
objc_autoreleasePoolPop(pool);
}
@end
|
Modified tests/ScryptTests.m from [dc13eea305] to [b2b1c50b4e].
| ︙ | ︙ | |||
152 153 154 155 156 157 158 | TEST(@"ROMix", R(memcpy(ROMixBuffer, ROMixInput, 128)) && R(of_scrypt_romix(ROMixBuffer, 1, 16, ROMixTmp)) && memcmp(ROMixBuffer, ROMixOutput, 128) == 0) TEST(@"scrypt test vector #1", | > > > > | > > > > > > | > > > > | > > > > > > | > > > > | > | > > > > | > > > > | > | > > > > | | 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 |
TEST(@"ROMix",
R(memcpy(ROMixBuffer, ROMixInput, 128)) &&
R(of_scrypt_romix(ROMixBuffer, 1, 16, ROMixTmp)) &&
memcmp(ROMixBuffer, ROMixOutput, 128) == 0)
TEST(@"scrypt test vector #1",
R(of_scrypt((of_scrypt_parameters_t){
.blockSize = 1,
.costFactor = 16,
.parallelization = 1,
.salt = (unsigned char *)"",
.saltLength = 0,
.password = "",
.passwordLength = 0,
.key = output,
.keyLength = 64,
.allowsSwappableMemory = true
})) && memcmp(output, testVector1, 64) == 0)
TEST(@"scrypt test vector #2",
R(of_scrypt((of_scrypt_parameters_t){
.blockSize = 8,
.costFactor = 1024,
.parallelization = 16,
.salt = (unsigned char *)"NaCl",
.saltLength = 4,
.password = "password",
.passwordLength = 8,
.key = output,
.keyLength = 64,
.allowsSwappableMemory = true
})) && memcmp(output, testVector2, 64) == 0)
TEST(@"scrypt test vector #3",
R(of_scrypt((of_scrypt_parameters_t){
.blockSize = 8,
.costFactor = 16384,
.parallelization = 1,
.salt = (unsigned char *)"SodiumChloride",
.saltLength = 14,
.password = "pleaseletmein",
.passwordLength = 13,
.key = output,
.keyLength = 64,
.allowsSwappableMemory = true
})) && memcmp(output, testVector3, 64) == 0)
/* The forth test vector is too expensive to include it in the tests. */
#if 0
TEST(@"scrypt test vector #4",
R(of_scrypt((of_scrypt_parameters_t){
.blockSize = 8,
.costFactor = 1048576,
.parallelization = 1,
.salt = (unsigned char *)"SodiumChloride",
.saltLength = 14,
.password = "pleaseletmein",
.passwordLength = 13,
.key = output,
.keyLength = 64,
.allowsSwappableMemory = true
})) && memcmp(output, testVector4, 64) == 0)
#endif
objc_autoreleasePoolPop(pool);
}
@end
|
Modified tests/TestsAppDelegate.m from [77e78bfed7] to [e6bc9a4f8c].
| ︙ | ︙ | |||
211 212 213 214 215 216 217 |
[of_stdout writeFormat: @"[%@] %@: ", module, test];
}
- (void)outputSuccess: (OFString *)test
inModule: (OFString *)module
{
if (of_stdout.hasTerminal) {
| < | < | | 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 |
[of_stdout writeFormat: @"[%@] %@: ", module, test];
}
- (void)outputSuccess: (OFString *)test
inModule: (OFString *)module
{
if (of_stdout.hasTerminal) {
of_stdout.foregroundColor = [OFColor lime];
[of_stdout eraseLine];
[of_stdout writeFormat: @"\r[%@] %@: ok\n", module, test];
} else
[of_stdout writeLine: @"ok"];
}
- (void)outputFailure: (OFString *)test
inModule: (OFString *)module
{
if (of_stdout.hasTerminal) {
of_stdout.foregroundColor = [OFColor red];
[of_stdout eraseLine];
[of_stdout writeFormat: @"\r[%@] %@: failed\n", module, test];
#ifdef OF_WII
[of_stdout reset];
[of_stdout writeLine: @"Press A to continue!"];
for (;;) {
WPAD_ScanPads();
|
| ︙ | ︙ | |||
283 284 285 286 287 288 289 | if (hidKeysDown() & KEY_A) break; gspWaitForVBlank(); } #endif | | | 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 | if (hidKeysDown() & KEY_A) break; gspWaitForVBlank(); } #endif [of_stdout writeString: @"\r"]; [of_stdout reset]; [of_stdout eraseLine]; } else [of_stdout writeLine: @"failed"]; } - (void)applicationDidFinishLaunching |
| ︙ | ︙ |
Modified tests/plugin/Makefile from [f500c20eb5] to [a32249aa5e].
1 2 3 4 5 6 7 8 9 |
PLUGIN_NOINST = TestPlugin${PLUGIN_SUFFIX}
SRCS = TestPlugin.m
include ../../buildsys.mk
include ../../extra.mk
CPPFLAGS += -I../.. -I../../src -I../../src/runtime
LIBS := ${TESTPLUGIN_LIBS} ${LIBS}
LD = ${OBJC}
| > > | 1 2 3 4 5 6 7 8 9 10 11 |
DISTCLEAN = Info.plist
PLUGIN_NOINST = TestPlugin${PLUGIN_SUFFIX}
SRCS = TestPlugin.m
include ../../buildsys.mk
include ../../extra.mk
CPPFLAGS += -I../.. -I../../src -I../../src/runtime
LIBS := ${TESTPLUGIN_LIBS} ${LIBS}
LD = ${OBJC}
|
Modified utils/ofarc/GZIPArchive.m from [6980ee8c7c] to [1991cfed6e].
| ︙ | ︙ | |||
39 40 41 42 43 44 45 46 47 48 49 50 51 52 |
dictionaryWithObject: [attributes objectForKey: key]
forKey: key];
[fileManager setAttributes: destinationAttributes
ofItemAtPath: destination];
#endif
}
@implementation GZIPArchive
+ (void)initialize
{
if (self == [GZIPArchive class])
app = (OFArc *)[OFApplication sharedApplication].delegate;
}
| > > > > > > > > > > > > > > > > | 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 |
dictionaryWithObject: [attributes objectForKey: key]
forKey: key];
[fileManager setAttributes: destinationAttributes
ofItemAtPath: destination];
#endif
}
static void
setModificationDate(OFString *path, OFGZIPStream *stream)
{
OFDate *modificationDate = stream.modificationDate;
of_file_attributes_t attributes;
if (modificationDate == nil)
return;
attributes = [OFDictionary
dictionaryWithObject: modificationDate
forKey: of_file_attribute_key_modification_date];
[[OFFileManager defaultManager] setAttributes: attributes
ofItemAtPath: path];
}
@implementation GZIPArchive
+ (void)initialize
{
if (self == [GZIPArchive class])
app = (OFArc *)[OFApplication sharedApplication].delegate;
}
|
| ︙ | ︙ | |||
127 128 129 130 131 132 133 134 135 136 137 138 139 140 |
if (length < 0) {
app->_exitStatus = 1;
return;
}
}
if (app->_outputLevel >= 0) {
[of_stdout writeString: @"\r"];
[of_stdout writeLine: OF_LOCALIZED(@"extracting_file_done",
@"Extracting %[file]... done",
@"file", fileName)];
}
}
| > > > | 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 |
if (length < 0) {
app->_exitStatus = 1;
return;
}
}
[output close];
setModificationDate(fileName, _stream);
if (app->_outputLevel >= 0) {
[of_stdout writeString: @"\r"];
[of_stdout writeLine: OF_LOCALIZED(@"extracting_file_done",
@"Extracting %[file]... done",
@"file", fileName)];
}
}
|
| ︙ | ︙ |
Modified utils/ofarc/LHAArchive.m from [8c23d6ffc7] to [b717d78c4a].
| ︙ | ︙ | |||
51 52 53 54 55 56 57 58 59 60 61 62 63 64 |
dictionaryWithObject: mode
forKey: of_file_attribute_key_posix_permissions];
[[OFFileManager defaultManager] setAttributes: attributes
ofItemAtPath: path];
#endif
}
@implementation LHAArchive
+ (void)initialize
{
if (self == [LHAArchive class])
app = (OFArc *)[OFApplication sharedApplication].delegate;
}
| > > > > > > > > > > > > > > > > > > > > > > > > | 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 |
dictionaryWithObject: mode
forKey: of_file_attribute_key_posix_permissions];
[[OFFileManager defaultManager] setAttributes: attributes
ofItemAtPath: path];
#endif
}
static void
setModificationDate(OFString *path, OFLHAArchiveEntry *entry)
{
OFDate *modificationDate = entry.modificationDate;
of_file_attributes_t attributes;
if (modificationDate == nil) {
/*
* Fall back to the original date if we have no modification
* date, as the modification date is a UNIX extension.
*/
modificationDate = entry.date;
if (modificationDate == nil)
return;
}
attributes = [OFDictionary
dictionaryWithObject: modificationDate
forKey: of_file_attribute_key_modification_date];
[[OFFileManager defaultManager] setAttributes: attributes
ofItemAtPath: path];
}
@implementation LHAArchive
+ (void)initialize
{
if (self == [LHAArchive class])
app = (OFArc *)[OFApplication sharedApplication].delegate;
}
|
| ︙ | ︙ | |||
281 282 283 284 285 286 287 288 289 290 291 292 293 294 |
@"Extracting %[file]...",
@"file", fileName)];
if ([fileName hasSuffix: @"/"]) {
[fileManager createDirectoryAtPath: outFileName
createParents: true];
setPermissions(outFileName, entry);
if (app->_outputLevel >= 0) {
[of_stdout writeString: @"\r"];
[of_stdout writeLine: OF_LOCALIZED(
@"extracting_file_done",
@"Extracting %[file]... done",
@"file", fileName)];
| > | 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 |
@"Extracting %[file]...",
@"file", fileName)];
if ([fileName hasSuffix: @"/"]) {
[fileManager createDirectoryAtPath: outFileName
createParents: true];
setPermissions(outFileName, entry);
setModificationDate(outFileName, entry);
if (app->_outputLevel >= 0) {
[of_stdout writeString: @"\r"];
[of_stdout writeLine: OF_LOCALIZED(
@"extracting_file_done",
@"Extracting %[file]... done",
@"file", fileName)];
|
| ︙ | ︙ | |||
337 338 339 340 341 342 343 344 345 346 347 348 349 350 |
@"extracting_file_percent",
@"Extracting %[file]... %[percent]%",
@"file", fileName,
@"percent", percentString)];
}
}
if (app->_outputLevel >= 0) {
[of_stdout writeString: @"\r"];
[of_stdout writeLine: OF_LOCALIZED(
@"extracting_file_done",
@"Extracting %[file]... done",
@"file", fileName)];
}
| > > > | 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 |
@"extracting_file_percent",
@"Extracting %[file]... %[percent]%",
@"file", fileName,
@"percent", percentString)];
}
}
[output close];
setModificationDate(outFileName, entry);
if (app->_outputLevel >= 0) {
[of_stdout writeString: @"\r"];
[of_stdout writeLine: OF_LOCALIZED(
@"extracting_file_done",
@"Extracting %[file]... done",
@"file", fileName)];
}
|
| ︙ | ︙ |
Modified utils/ofarc/TarArchive.m from [ce61d629aa] to [ed61f78528].
| ︙ | ︙ | |||
39 40 41 42 43 44 45 46 47 48 49 50 51 52 |
dictionaryWithObject: [OFNumber numberWithUInt16: entry.mode]
forKey: of_file_attribute_key_posix_permissions];
[[OFFileManager defaultManager] setAttributes: attributes
ofItemAtPath: path];
#endif
}
@implementation TarArchive
+ (void)initialize
{
if (self == [TarArchive class])
app = (OFArc *)[OFApplication sharedApplication].delegate;
}
| > > > > > > > > > > > > > > > > | 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 |
dictionaryWithObject: [OFNumber numberWithUInt16: entry.mode]
forKey: of_file_attribute_key_posix_permissions];
[[OFFileManager defaultManager] setAttributes: attributes
ofItemAtPath: path];
#endif
}
static void
setModificationDate(OFString *path, OFTarArchiveEntry *entry)
{
OFDate *modificationDate = entry.modificationDate;
of_file_attributes_t attributes;
if (modificationDate == nil)
return;
attributes = [OFDictionary
dictionaryWithObject: modificationDate
forKey: of_file_attribute_key_modification_date];
[[OFFileManager defaultManager] setAttributes: attributes
ofItemAtPath: path];
}
@implementation TarArchive
+ (void)initialize
{
if (self == [TarArchive class])
app = (OFArc *)[OFApplication sharedApplication].delegate;
}
|
| ︙ | ︙ | |||
302 303 304 305 306 307 308 309 310 311 312 313 314 315 |
if (type == OF_TAR_ARCHIVE_ENTRY_TYPE_DIRECTORY ||
(type == OF_TAR_ARCHIVE_ENTRY_TYPE_FILE &&
[fileName hasSuffix: @"/"])) {
[fileManager createDirectoryAtPath: outFileName
createParents: true];
setPermissions(outFileName, entry);
if (app->_outputLevel >= 0) {
[of_stdout writeString: @"\r"];
[of_stdout writeLine: OF_LOCALIZED(
@"extracting_file_done",
@"Extracting %[file]... done",
@"file", fileName)];
| > | 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 |
if (type == OF_TAR_ARCHIVE_ENTRY_TYPE_DIRECTORY ||
(type == OF_TAR_ARCHIVE_ENTRY_TYPE_FILE &&
[fileName hasSuffix: @"/"])) {
[fileManager createDirectoryAtPath: outFileName
createParents: true];
setPermissions(outFileName, entry);
setModificationDate(outFileName, entry);
if (app->_outputLevel >= 0) {
[of_stdout writeString: @"\r"];
[of_stdout writeLine: OF_LOCALIZED(
@"extracting_file_done",
@"Extracting %[file]... done",
@"file", fileName)];
|
| ︙ | ︙ | |||
358 359 360 361 362 363 364 365 366 367 368 369 370 371 |
@"extracting_file_percent",
@"Extracting %[file]... %[percent]%",
@"file", fileName,
@"percent", percentString)];
}
}
if (app->_outputLevel >= 0) {
[of_stdout writeString: @"\r"];
[of_stdout writeLine: OF_LOCALIZED(
@"extracting_file_done",
@"Extracting %[file]... done",
@"file", fileName)];
}
| > > > | 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 |
@"extracting_file_percent",
@"Extracting %[file]... %[percent]%",
@"file", fileName,
@"percent", percentString)];
}
}
[output close];
setModificationDate(outFileName, entry);
if (app->_outputLevel >= 0) {
[of_stdout writeString: @"\r"];
[of_stdout writeLine: OF_LOCALIZED(
@"extracting_file_done",
@"Extracting %[file]... done",
@"file", fileName)];
}
|
| ︙ | ︙ |
Modified utils/ofarc/ZIPArchive.m from [f7e021bab7] to [251b5d4973].
| ︙ | ︙ | |||
52 53 54 55 56 57 58 59 60 61 62 63 64 65 |
forKey: key];
[[OFFileManager defaultManager] setAttributes: attributes
ofItemAtPath: path];
}
#endif
}
@implementation ZIPArchive
+ (void)initialize
{
if (self == [ZIPArchive class])
app = (OFArc *)[OFApplication sharedApplication].delegate;
}
| > > > > > > > > > > > > > > > > | 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 |
forKey: key];
[[OFFileManager defaultManager] setAttributes: attributes
ofItemAtPath: path];
}
#endif
}
static void
setModificationDate(OFString *path, OFZIPArchiveEntry *entry)
{
OFDate *modificationDate = entry.modificationDate;
of_file_attributes_t attributes;
if (modificationDate == nil)
return;
attributes = [OFDictionary
dictionaryWithObject: modificationDate
forKey: of_file_attribute_key_modification_date];
[[OFFileManager defaultManager] setAttributes: attributes
ofItemAtPath: path];
}
@implementation ZIPArchive
+ (void)initialize
{
if (self == [ZIPArchive class])
app = (OFArc *)[OFApplication sharedApplication].delegate;
}
|
| ︙ | ︙ | |||
258 259 260 261 262 263 264 265 266 267 268 269 270 271 |
@"Extracting %[file]...",
@"file", fileName)];
if ([fileName hasSuffix: @"/"]) {
[fileManager createDirectoryAtPath: outFileName
createParents: true];
setPermissions(outFileName, entry);
if (app->_outputLevel >= 0) {
[of_stdout writeString: @"\r"];
[of_stdout writeLine: OF_LOCALIZED(
@"extracting_file_done",
@"Extracting %[file]... done",
@"file", fileName)];
| > | 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 |
@"Extracting %[file]...",
@"file", fileName)];
if ([fileName hasSuffix: @"/"]) {
[fileManager createDirectoryAtPath: outFileName
createParents: true];
setPermissions(outFileName, entry);
setModificationDate(outFileName, entry);
if (app->_outputLevel >= 0) {
[of_stdout writeString: @"\r"];
[of_stdout writeLine: OF_LOCALIZED(
@"extracting_file_done",
@"Extracting %[file]... done",
@"file", fileName)];
|
| ︙ | ︙ | |||
314 315 316 317 318 319 320 321 322 323 324 325 326 327 |
@"extracting_file_percent",
@"Extracting %[file]... %[percent]%",
@"file", fileName,
@"percent", percentString)];
}
}
if (app->_outputLevel >= 0) {
[of_stdout writeString: @"\r"];
[of_stdout writeLine: OF_LOCALIZED(
@"extracting_file_done",
@"Extracting %[file]... done",
@"file", fileName)];
}
| > > > | 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 |
@"extracting_file_percent",
@"Extracting %[file]... %[percent]%",
@"file", fileName,
@"percent", percentString)];
}
}
[output close];
setModificationDate(outFileName, entry);
if (app->_outputLevel >= 0) {
[of_stdout writeString: @"\r"];
[of_stdout writeLine: OF_LOCALIZED(
@"extracting_file_done",
@"Extracting %[file]... done",
@"file", fileName)];
}
|
| ︙ | ︙ |