Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (62e16300625ab5d07798dbc74ebda370fabce48e)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (62e16300625ab5d07798dbc74ebda370fabce48e)
  • Date: Wed, 26 Mar 2008 04:45:51 -0500

GIT changes to master sorcery by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

ChangeLog | 6 ++++++
var/lib/sorcery/modules/libdispel | 4 ++--
var/lib/sorcery/modules/libmisc | 14 +++++++-------
var/lib/sorcery/modules/libsorcery | 8 ++------
4 files changed, 17 insertions(+), 15 deletions(-)

New commits:
commit 62e16300625ab5d07798dbc74ebda370fabce48e
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

* libsorcery: deprecated dirnames() for get_dirnames() in libmisc
* libmisc: adjusted formatting in get_dirnames and get_basenames and
made
them use the faster internal smgl_dirname and smgl_basename
respectively
* libdispel, libmisc: fixed the only three callers to use get_dirnames

diff --git a/ChangeLog b/ChangeLog
index 42ad804..77f2feb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-26 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libsorcery: deprecated dirnames() for get_dirnames() in libmisc
+ * libmisc: adjusted formatting in get_dirnames and get_basenames and
made
+ them use the faster internal smgl_dirname and smgl_basename
respectively
+ * libdispel, libmisc: fixed the only three callers to use get_dirnames
+
2008-03-25 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libsorcery: reformatted the files, directories and symlinks
functions and
made their variable local
diff --git a/var/lib/sorcery/modules/libdispel
b/var/lib/sorcery/modules/libdispel
index 5f73918..2a5a9a0 100755
--- a/var/lib/sorcery/modules/libdispel
+++ b/var/lib/sorcery/modules/libdispel
@@ -169,7 +169,7 @@ function reaper() {
[ -f $REAPER_SYMS ] && rm -f `cat $REAPER_SYMS` 2>/dev/null
[ -f $REAPER_SPECIAL ] && rm -f `cat $REAPER_SPECIAL` 2>/dev/null
[ -f $REAPER_DIRS ] && rmdir `sort -r $REAPER_DIRS` 2>/dev/null
- [ -f $REAPER_FILES ] && rmdir `dirnames < $REAPER_FILES |uniq|sort -r`
2>/dev/null
+ [ -f $REAPER_FILES ] && rmdir `get_dirnames < $REAPER_FILES |uniq|sort -r`
2>/dev/null

rm -f $REAPER_FILES $REAPER_DIRS $REAPER_SYMS $REAPER_SPECIAL
}
@@ -211,7 +211,7 @@ function reap_state_files() {

[ -f $REAPER_SYMS ] && rm -f `cat $REAPER_SYMS` 2>/dev/null
[ -f $REAPER_DIRS ] && rmdir `sort -r $REAPER_DIRS` 2>/dev/null
- [ -f $REAPER_FILES ] && rmdir `dirnames < $REAPER_FILES |uniq|sort -r`
2>/dev/null
+ [ -f $REAPER_FILES ] && rmdir `get_dirnames < $REAPER_FILES |uniq|sort -r`
2>/dev/null

rm -f $REAPER_FILES $REAPER_DIRS $REAPER_SYMS

diff --git a/var/lib/sorcery/modules/libmisc b/var/lib/sorcery/modules/libmisc
index d23245a..9c526a7 100755
--- a/var/lib/sorcery/modules/libmisc
+++ b/var/lib/sorcery/modules/libmisc
@@ -416,9 +416,9 @@ function consolidate_params() {
##
#---------------------------------------------------------------------
function get_basenames() {
- local DIRECTORY=''
- while read DIRECTORY; do
- basename "$DIRECTORY"
+ local directory
+ while read directory; do
+ smgl_basename "$directory"
done
}

@@ -431,9 +431,9 @@ function get_basenames() {
##
#---------------------------------------------------------------------
function get_dirnames() {
- local PATH_NAME=''
- while read PATH_NAME; do
- dirname "$PATH_NAME"
+ local path_name
+ while read path_name; do
+ smgl_dirname "$path_name"
done
}

@@ -1084,7 +1084,7 @@ function remove_files_and_dirs() {
# remove possibly empty directories, rmdir WILL have error output
# because some directories wont be empty for one of many reasons,
# this is OKAY
- cat $1|dirnames|while read dir; do
+ cat $1|get_dirnames|while read dir; do
until [[ $dir == ${2:-/} ]] ; do
rmdir $dir &>/dev/null || break
dir=$(dirname $dir)
diff --git a/var/lib/sorcery/modules/libsorcery
b/var/lib/sorcery/modules/libsorcery
index b51f0ee..b2afdcb 100755
--- a/var/lib/sorcery/modules/libsorcery
+++ b/var/lib/sorcery/modules/libsorcery
@@ -629,16 +629,12 @@ function filter_protected() {
## @Stdin list of files
## @Stdout list of directories
##
+## THIS FUNCTION IS DEPRECIATED, use get_dirnames instead! (remove in 1.16)
## Given a list of files from standard input, returns the directory
## of each file.
-##
-## Note: Is a duplicate of get_dirnames. 2003-09-28 Martin
#---------------------------------------------------------------------
function dirnames() {
- local file
- while read file; do
- smgl_dirname "$file"
- done
+ get_dirnames "$@"
}

#---------------------------------------------------------------------



  • [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (62e16300625ab5d07798dbc74ebda370fabce48e), Jaka Kranjc, 03/26/2008

Archive powered by MHonArc 2.6.24.

Top of Page