Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions bin/xbps-create/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -400,11 +400,11 @@ ftw_cb(const char *fpath, const struct stat *sb, const struct dirent *dir UNUSED
if (xe == NULL)
die("calloc");

/* XXX: fileinfo contains the sanatized path, whereas xe contains the
* unsanatized path!
/* XXX: fileinfo contains the sanitized path, whereas xe contains the
* unsanitized path!
*
* when handing the files over, do not use the dictionary directly. Instead
* use the keysym, as this value has the unsanatized path.
* use the keysym, as this value has the unsanitized path.
*/
xbps_dictionary_set_cstring(fileinfo, "file", filep);
xbps_dictionary_set(all_filesd, fpath, fileinfo);
Expand Down
6 changes: 3 additions & 3 deletions bin/xbps-fbulk/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ waitRunning(int flags)

/*
* Start new builds from the build list and handle build completions,
* which can potentialy add new items to the build list.
* which can potentially add new items to the build list.
*
* This routine will maintain up to NParallel builds. A new build is
* only started once its dependencies have completed successfully so
Expand Down Expand Up @@ -480,12 +480,12 @@ ordered_depends(const char *bpath, const char *pkgn)
if (stat(dpath, &st) == -1) {
/*
* Ignore unexistent dependencies, this
* might happen for virtual packages or
* might happen for virtual packages or
* autogenerated pkgs (-32bit, etc).
*
* We don't really care if the pkg has
* invalid dependencies, at build time they
* will be properly catched by xbps-src.
* will be properly caught by xbps-src.
*/
continue;
}
Expand Down
2 changes: 1 addition & 1 deletion bin/xbps-install/xbps-install.1
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ Currently the following modes are available:
.It Sy hold
The package is on hold mode.
Packages in this mode won't be updated unless
it's explicitely declared to be updated.
it's explicitly declared to be updated.
The only way to update packages in this mode is by using the
.Fl f , Fl -force
option.
Expand Down
2 changes: 1 addition & 1 deletion bin/xbps-query/xbps-query.1
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ Currently the following modes are available:
.Bl -tag -width -x
.It Sy hold
The package is on hold mode.
Packages in this mode won't be updated unless it's explicitely declared to be updated.
Packages in this mode won't be updated unless it's explicitly declared to be updated.
The only way to update packages in this mode is by using the
.Fl f, Fl -force
option.
Expand Down
4 changes: 2 additions & 2 deletions bin/xbps-rindex/index-add.c
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ repodata_commit(const char *repodir, const char *repoarch,
xbps_object_iterator_release(iter);

/*
* purge all packages that are fullfilled by the index and
* purge all packages that are fulfilled by the index and
* not in the stage.
*/
iter = xbps_dictionary_iterator(index);
Expand All @@ -130,7 +130,7 @@ repodata_commit(const char *repodir, const char *repoarch,
xbps_object_iterator_release(iter);

/*
* purge all packages that are fullfilled by the stage
* purge all packages that are fulfilled by the stage
*/
iter = xbps_dictionary_iterator(stage);
while ((keysym = xbps_object_iterator_next(iter))) {
Expand Down
2 changes: 1 addition & 1 deletion configure
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ fi
#
check_compiler_flag "std=c99" "" CFLAGS
if [ $? -ne 0 ]; then
echo "ERRROR: A compatible C99 compiler is required, exiting..."
echo "ERROR: A compatible C99 compiler is required, exiting..."
exit 1
fi
#
Expand Down
2 changes: 1 addition & 1 deletion data/xbps.7
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ Currently the following modes are available:
.It Sy hold
The package is on hold mode.
Packages in this mode won't be updated unless
it's explicitely declared to be updated.
it's explicitly declared to be updated.
The only way to update packages in this mode is by using the
.Fl f , Fl -force
option.
Expand Down
2 changes: 1 addition & 1 deletion data/xbps.conf
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#syslog=true

# Enable package best matching (disabled by default). If enabled a package with
# the greatest version available in all repositories will be choosen, rather
# the greatest version available in all repositories will be chosen, rather
# than on the first package matching the expression.
#
#bestmatching=true
Expand Down
2 changes: 1 addition & 1 deletion include/mainpage.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*
* http://www.apple.com/DTDs/PropertyList-1.0.dtd
*
* NetBSD's proplib has been choosed because it's fast, extensible, and easy
* NetBSD's proplib has been chosen because it's fast, extensible, and easy
* to use. These are the three facts I mentioned:
*
* - <b>Fast</b> because proplib uses an ultra optimized
Expand Down
52 changes: 26 additions & 26 deletions include/xbps.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@
/**
* @def XBPS_FLAG_FORCE_UNPACK
* Force flag used in xbps_unpack_binary_pkg(). If set its package
* files will be unpacked overwritting the current ones.
* files will be unpacked overwriting the current ones.
* Must be set through the xbps_handle::flags member.
*/
#define XBPS_FLAG_FORCE_UNPACK 0x00000040
Expand Down Expand Up @@ -488,7 +488,7 @@ struct xbps_fetch_cb_data {
/**
* @var cb_end
*
* If true the function callback should be prepated to
* If true the function callback should be prepared to
* end the transfer progress.
*/
bool cb_end;
Expand Down Expand Up @@ -888,7 +888,7 @@ int xbps_fetch_file_dest_sha256(struct xbps_handle *xhp, const char *uri,
/**
* Returns last error string reported by xbps_fetch_file().
*
* @return A string with the appropiate error message.
* @return A string with the appropriate error message.
*/
const char *xbps_fetch_error_string(void);

Expand All @@ -904,7 +904,7 @@ const char *xbps_fetch_error_string(void);
* packages that should be treated as they were already removed (optional).
*
* @return A proplib array of dictionaries with all orphans found,
* on error NULL is returned and errno is set appropiately.
* on error NULL is returned and errno is set appropriately.
*/
xbps_array_t xbps_find_pkg_orphans(struct xbps_handle *xhp, xbps_array_t orphans);

Expand Down Expand Up @@ -1196,7 +1196,7 @@ bool xbps_match_any_virtualpkg_in_rundeps(xbps_array_t rundeps, xbps_array_t pro
* @param[in] array The proplib array to search on.
* @param[in] pkgname The package name to match.
*
* @return true on success, false otherwise and errno is set appropiately.
* @return true on success, false otherwise and errno is set appropriately.
*/
bool xbps_match_pkgname_in_array(xbps_array_t array, const char *pkgname);

Expand All @@ -1206,7 +1206,7 @@ bool xbps_match_pkgname_in_array(xbps_array_t array, const char *pkgname);
* @param[in] array The proplib array to search on.
* @param[in] pkgver The package name/version to match.
*
* @return true on success, false otherwise and errno is set appropiately.
* @return true on success, false otherwise and errno is set appropriately.
*/
bool xbps_match_pkgver_in_array(xbps_array_t array, const char *pkgver);

Expand All @@ -1216,7 +1216,7 @@ bool xbps_match_pkgver_in_array(xbps_array_t array, const char *pkgver);
* @param[in] array The proplib array to search on.
* @param[in] pattern The package pattern to match, i.e `foo>=0' or `foo<1'.
*
* @return true on success, false otherwise and errno is set appropiately.
* @return true on success, false otherwise and errno is set appropriately.
*/
bool xbps_match_pkgpattern_in_array(xbps_array_t array, const char *pattern);

Expand All @@ -1227,7 +1227,7 @@ bool xbps_match_pkgpattern_in_array(xbps_array_t array, const char *pattern);
* @param[in] array The proplib array to search on.
* @param[in] pkgver The package name-version to match, i.e `foo-1.0_1'.
*
* @return true on success, false otherwise and errno is set appropiately.
* @return true on success, false otherwise and errno is set appropriately.
*/
bool xbps_match_pkgdep_in_array(xbps_array_t array, const char *pkgver);

Expand All @@ -1237,7 +1237,7 @@ bool xbps_match_pkgdep_in_array(xbps_array_t array, const char *pkgver);
* @param[in] array The proplib array to search on.
* @param[in] val The string to be matched.
*
* @return true on success, false otherwise and errno is set appropiately.
* @return true on success, false otherwise and errno is set appropriately.
*/
bool xbps_match_string_in_array(xbps_array_t array, const char *val);

Expand All @@ -1249,7 +1249,7 @@ bool xbps_match_string_in_array(xbps_array_t array, const char *val);
* @param[in] key Key associated with the array.
*
* @return A proplib object iterator on success, NULL otherwise and
* errno is set appropiately.
* errno is set appropriately.
*/
xbps_object_iterator_t xbps_array_iter_from_dict(xbps_dictionary_t dict, const char *key);

Expand All @@ -1274,7 +1274,7 @@ xbps_object_iterator_t xbps_array_iter_from_dict(xbps_dictionary_t dict, const c
* @retval ENOENT Package not matched in repository pool.
* @retval ENOTSUP No repositories are available.
* @retval ENXIO Package depends on invalid dependencies.
* @retval EINVAL Any other error ocurred in the process.
* @retval EINVAL Any other error occurred in the process.
* @retval EBUSY The xbps package must be updated.
*/
int xbps_transaction_install_pkg(struct xbps_handle *xhp, const char *pkg, bool force);
Expand All @@ -1298,7 +1298,7 @@ int xbps_transaction_install_pkg(struct xbps_handle *xhp, const char *pkg, bool
* @retval ENOENT Package not matched in repository pool.
* @retval ENOTSUP No repositories are available.
* @retval ENXIO Package depends on invalid dependencies.
* @retval EINVAL Any other error ocurred in the process.
* @retval EINVAL Any other error occurred in the process.
* @retval EBUSY The xbps package must be updated.
*/
int xbps_transaction_update_pkg(struct xbps_handle *xhp, const char *pkgname, bool force);
Expand All @@ -1315,7 +1315,7 @@ int xbps_transaction_update_pkg(struct xbps_handle *xhp, const char *pkgname, bo
* @retval EEXIST All installed packages are already up-to-date.
* @retval ENOENT No packages currently register.
* @retval ENOTSUP No repositories currently installed.
* @retval EINVAL Any other error ocurred in the process.
* @retval EINVAL Any other error occurred in the process.
*/
int xbps_transaction_update_packages(struct xbps_handle *xhp);

Expand All @@ -1332,7 +1332,7 @@ int xbps_transaction_update_packages(struct xbps_handle *xhp);
* @retval ENOENT Package is not installed.
* @retval EEXIST Package has reverse dependencies.
* @retval EINVAL
* @retval ENXIO A problem ocurred in the process.
* @retval ENXIO A problem occurred in the process.
*/
int xbps_transaction_remove_pkg(struct xbps_handle *xhp, const char *pkgname, bool recursive);

Expand All @@ -1345,7 +1345,7 @@ int xbps_transaction_remove_pkg(struct xbps_handle *xhp, const char *pkgname, bo
* @retval 0 success.
* @retval ENOENT No package orphans were found.
* @retval ENXIO
* @retval EINVAL A problem ocurred in the process.
* @retval EINVAL A problem occurred in the process.
*/
int xbps_transaction_autoremove_pkgs(struct xbps_handle *xhp);

Expand Down Expand Up @@ -1445,7 +1445,7 @@ bool xbps_transaction_pkg_type_set(xbps_dictionary_t pkg_repod, xbps_trans_type_
* @param[in] fname File name to match.
*
* @return A malloc(3)ed buffer with the contents of \a fname, NULL otherwise
* and errno is set appropiately.
* and errno is set appropriately.
*/
char *xbps_archive_fetch_file(const char *url, const char *fname);

Expand All @@ -1470,7 +1470,7 @@ int xbps_archive_fetch_file_into_fd(const char *url, const char *fname, int fd);
* @param[in] p Proplist file name to internalize as a dictionary.
*
* @return An internalized proplib dictionary, otherwise NULL and
* errno is set appropiately.
* errno is set appropriately.
*/
xbps_dictionary_t xbps_archive_fetch_plist(const char *url, const char *p);

Expand Down Expand Up @@ -1628,7 +1628,7 @@ xbps_dictionary_t xbps_rpool_get_virtualpkg(struct xbps_handle *xhp, const char
* @param[in] pkg Package expression to match in this repository index.
*
* @return The array of strings on success, NULL otherwise and errno is
* set appropiately.
* set appropriately.
*/
xbps_array_t xbps_rpool_get_pkg_revdeps(struct xbps_handle *xhp, const char *pkg);

Expand Down Expand Up @@ -1677,7 +1677,7 @@ bool xbps_repo_remove(struct xbps_handle *xhp, const char *url);
* @param[out] lockfd Lock file descriptor assigned.
* @param[out] lockfname Lock filename assigned.
*
* @return True on success and lockfd/lockfname are assigned appropiately.
* @return True on success and lockfd/lockfname are assigned appropriately.
* otherwise false and lockfd/lockfname aren't set.
*/
int xbps_repo_lock(const char *repodir, const char *arch);
Expand Down Expand Up @@ -1768,7 +1768,7 @@ xbps_dictionary_t xbps_repo_get_virtualpkg(struct xbps_repo *repo, const char *p
* @param[in] pkg Package expression to match in this repository index.
*
* @return The array of strings on success, NULL otherwise and errno is
* set appropiately.
* set appropriately.
*/
xbps_array_t xbps_repo_get_pkg_revdeps(struct xbps_repo *repo, const char *pkg);

Expand Down Expand Up @@ -1915,7 +1915,7 @@ bool xbps_remove_string_from_array(xbps_array_t array, const char *str);
* @param[in] path Path for final directory.
* @param[in] mode Mode for final directory (0755 if not specified).
*
* @return 0 on success, -1 on error and errno set appropiately.
* @return 0 on success, -1 on error and errno set appropriately.
*/
int xbps_mkpath(const char *path, mode_t mode);

Expand All @@ -1925,7 +1925,7 @@ int xbps_mkpath(const char *path, mode_t mode);
*
* @param[in] fmt Format string, see printf(3).
* @return A pointer to a malloc(3)ed string, NULL otherwise and errno
* is set appropiately. The pointer should be free(3)d when it's
* is set appropriately. The pointer should be free(3)d when it's
* no longer needed.
*/
char *xbps_xasprintf(const char *fmt, ...)__attribute__ ((format (printf, 1, 2)));
Expand All @@ -1940,7 +1940,7 @@ char *xbps_xasprintf(const char *fmt, ...)__attribute__ ((format (printf, 1, 2))
* @param[out] filelen File size length.
*
* @return True on success, false otherwise and errno
* is set appropiately. The mmaped object should be munmap()ed when it's
* is set appropriately. The mmap()ed object should be munmap()ed when it's
* not longer needed.
*/
bool xbps_mmap_file(const char *file, void **mmf, size_t *mmflen, size_t *filelen);
Expand Down Expand Up @@ -2013,7 +2013,7 @@ bool xbps_verify_file_signature(struct xbps_repo *repo, const char *fname);
* @param[in] xhp The pointer to an xbps_handle struct.
* @param[in] pkg Package name, version pattern or exact pkg to match.
*
* @return -1 on error (errno set appropiately), 0 if \a pkg
* @return -1 on error (errno set appropriately), 0 if \a pkg
* didn't match installed package, 1 if \a pkg pattern fully
* matched installed package.
*/
Expand Down Expand Up @@ -2172,7 +2172,7 @@ bool xbps_pkgpattern_name(char *dst, size_t len, const char *pattern);
const char *xbps_pkg_version(const char *pkg);

/**
* Gets the pkgname/version componentn of a binary package string,
* Gets the pkgname/version component of a binary package string,
* i.e `foo-2.0_1.<arch>.xbps`.
*
* @param[in] pkg Package string.
Expand Down Expand Up @@ -2203,7 +2203,7 @@ char *xbps_binpkg_arch(const char *pkg);
* xbps_get_pkgpattern_name() apply here.
*
* @return A string with the pattern version, NULL otherwise and
* errno is set appropiately.
* errno is set appropriately.
*/
const char *xbps_pkgpattern_version(const char *pattern);

Expand Down
2 changes: 1 addition & 1 deletion lib/package_configure.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
* @defgroup configure Package configuration functions
*
* Configure a package or all packages. Only packages in XBPS_PKG_STATE_UNPACKED
* state will be processed (unless overriden). Package configuration steps:
* state will be processed (unless overridden). Package configuration steps:
* - Its <b>post-install</b> target in the INSTALL script will be executed.
* - Its state will be changed to XBPS_PKG_STATE_INSTALLED if previous step
* ran successful.
Expand Down
2 changes: 1 addition & 1 deletion lib/pubkey2fp.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* An implementation of convertion from OpenSSL to OpenSSH public key format
* An implementation of conversion from OpenSSL to OpenSSH public key format
*
* Copyright (c) 2008 Mounir IDRASSI <mounir.idrassi@idrix.fr>. All rights reserved.
*
Expand Down
4 changes: 2 additions & 2 deletions lib/repo.c
Original file line number Diff line number Diff line change
Expand Up @@ -818,7 +818,7 @@ xbps_repo_key_import(struct xbps_repo *repo)
goto out;
}
/*
* Check if the public key is alredy stored.
* Check if the public key is already stored.
*/
rkeyfile = xbps_xasprintf("%s/keys/%s.plist", repo->xhp->metadir, hexfp);
repokeyd = xbps_plist_dictionary_from_file(rkeyfile);
Expand All @@ -827,7 +827,7 @@ xbps_repo_key_import(struct xbps_repo *repo)
goto out;
}
/*
* Notify the client and take appropiate action to import
* Notify the client and take appropriate action to import
* the repository public key. Pass back the public key openssh fingerprint
* to the client.
*/
Expand Down
2 changes: 1 addition & 1 deletion lib/transaction_files.c
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ addItem(const char *file)

/*
* File paths are stored relative, but looked up absolute.
* Skip the leading . (dot) and substract it from the length.
* Skip the leading . (dot) and subtract it from the length.
*/
HASH_ADD_KEYPTR(hh, hashtab, item->file+1, item->len-1, item);

Expand Down
Loading
Loading