Fix x86_64 vs. i686.

[nethome.git] / .bashrc

diff --git a/.bashrc b/.bashrc
index 32ca2bb..da4df3a 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -97,7 +97,7 @@ _bash_profile_addpath    -s CVSROOT "$HOME/pserver/cvs"
 _bash_profile_addpath    -s CVSROOT "$HOME/cvs"
 _bash_profile_addpath    -s ANT_HOME "/usr/local/ant"
 
-for _perldir in $(eval "echo $HOME{/share,/lib{,64}}/perl5");do
+for _perldir in $(eval "echo $HOME{/share,/lib{,64}}/perl5{/site_perl,}");do
        _bash_profile_addpath -f PERL5LIB "$_perldir"
        done
 unset _perldir
@@ -150,7 +150,7 @@ eval '
        function disass { objdump -D --target=binary --architecture=i386 "$@"; }
        function cal {(unset cal; ( cal -m "$@"; ); );}
        function vncreadonly { vncviewer -FullColor -Shared -ViewOnly "$@"; }
-       function diff {(unset diff; ( diff -up "$@"; ); );}
+       function diff {(unset diff; ( diff -dup "$@"; ); );}
        function rpmbuildlocal { nice rpmbuild --define "_topdir $PWD" --define "_builddir $PWD" --define "_rpmdir $PWD" --define "_sourcedir $PWD" --define "_specdir $PWD" --define "_srcrpmdir $PWD" --define "_build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" "$@"; rmdir &>/dev/null BUILDROOT; }
        function gdbn { gdb -nx --command=~/.gdbinit "$@"; }
        function hd { od -Ax -tx1; }
@@ -277,7 +277,7 @@ function debuginfo { if test -n "$*";then echo "$*";else cat;fi \
        |xargs rpm -qf|xargs rpmquery --qf '%{SOURCERPM}\n'|sed 's/-[^-]*-[^-]*[.]src[.]rpm$/-debuginfo/'|sort -u; }
 function ipcsrmall { ipcs|awk '/- Shared Memory/{x="-m"}/- Semaphore/{x="-s"}/^0x/{print "ipcrm "x" "$2}'; }
 function eog {(unset eog; touch /tmp/eog.$$;eog "$@" {,,,,,,,,,}/tmp/eog.$$;rm -f /tmp/eog.$$; );}
-function diffc { diff -up "$@"|grep -v '^\(Only in \|Binary files\)'; }
+function diffc { diff -dup "$@"|grep -v '^\(Only in \|Binary files\)'; }
 function diffi { diffc -X ~/.diffi.list "$@" | diffdecvs; }
 function cvs {(unset cvs
        local _opts _opts_d _now _line _o
@@ -388,7 +388,7 @@ function rpmsrclist
                        | sort -u
        fi
 }
-function valgrind {(set -e;unset valgrind;s=~/.python.valgrind;rm -f $s;cp -p /usr/share/doc/python-devel-2.*/valgrind-python.supp $s;patch $s <$s.patch;perl -i -e 'undef $/;$_=<>;1 while s/^(?:###)?({\n)(?:###)?( *ADDRESS_IN_RANGE.*\n(?:[^}#].*\n)*)###/$1$2/gm;print;' $s;valgrind --suppressions=$s "$@";);}
+function valgrind {(set -e;unset valgrind;s=~/.python.valgrind;rm -f $s;cp -p /usr/share/doc/python-devel-2.*/valgrind-python.supp $s;patch $s <$s.patch;perl -i -e 'undef $/;$_=<>;1 while s/^(?:###)?({\n)(?:###)?( *ADDRESS_IN_RANGE.*\n(?:[^}#].*\n)*)###/$1$2/gm;print;' $s;valgrind --num-callers=50 --suppressions=$s "$@";);}
 function yumupdate {(ulimit -v unlimited;yum makecache;yum -y --skip-broken update "$@";);}
 
 ulimit -S -c 0