2 files changed, 2 insertions, 2 deletions

diff --git a/core/launcher/opie-taskbar.prerm b/core/launcher/opie-taskbar.prerm
index 664160b..ae02235 100755
--- a/core/launcher/opie-taskbar.prerm
+++ b/core/launcher/opie-taskbar.prerm
@@ -1,5 +1,5 @@
 #/bin/sh
 
-find /etc -name [SK][0-9][0-9]opie | xargs rm -f
+find /etc -name [SK][0-9][0-9]opie | xargs -- rm -f
 
 exit 0
diff --git a/libopie2/tools/regen.py b/libopie2/tools/regen.py
index 89385e1..2f53a14 100755
--- a/libopie2/tools/regen.py
+++ b/libopie2/tools/regen.py
@@ -1,110 +1,110 @@
 #!/usr/bin/env python
 
 """Regenerate C++ mapping classes"""
 
 #---------------------------------------------------------------------------#
 #                                                                           #
 #---------------------------------------------------------------------------#
 
 def regenDebugMapper( basename ):
     """
     Debug Mapper - maps ioctl numbers to names, e.g. 0x4x5a -> SIOCGIWNAME
     """
 
-    result = os.popen( 'find /usr/include -name "*.h" |xargs grep -h SIOC|grep 0x' ).readlines()
+    result = os.popen( 'find /usr/include -name "*.h" |xargs -- grep -h SIOC|grep 0x' ).readlines()
 
     try:
         tablehfile = file( basename+".h", "w" )
     except:
         tablehfile = sys.stdout
 
     try:
         tablecfile = file( basename+".cpp", "w" )
     except:
         tablecfile = sys.stdout
 
     print >>tablehfile,"""
 /*
  * debug value mapper - generated by %s - (C) Michael 'Mickey' Lauer <mickey@vanille.de>
  */
 
 #ifndef DEBUGMAPPER_H
 #define DEBUGMAPPER_H
 
 #include <qstring.h>
 #include <qintdict.h>
 
 typedef QIntDict<QString> IntStringMap;
 
 class DebugMapper
 {
   public:
     DebugMapper();
     ~DebugMapper();
 
     const QString& map( int value ) const;
   private:
     IntStringMap _map;
 };
 
 #endif
 """ % sys.argv[0]
 
     print >>tablecfile,"""
 /*
  * debug value mapper - generated by %s - (C) Michael 'Mickey' Lauer <mickey@vanille.de>
  */
 
 #include <opie2/odebug.h>
 
 #include "%s"
 
 DebugMapper::DebugMapper()
 {
     odebug << "DebugMapper::DebugMapper()" << oendl;
 
 """ % ( sys.argv[0], tablehfile.name )
 
     for line in result:
         l = line.split()
         if not l[0].startswith( "#define" ) or not l[2].startswith( "0x" ):
             print >>sys.stderr, "can't parse line: %s" % l
             continue
         print >>tablecfile, "    _map.insert( %s, new QString(\"%s\") );" % ( l[2], l[1] )
 
 
     print >>tablecfile,"""
 };
 
 
 DebugMapper::~DebugMapper()
 {
     odebug << "DebugMapper::~DebugMapper()" << oendl;
 }
 
 
 const QString& DebugMapper::map( int value ) const
 {
     QString* result = _map[ value ];
 
     if ( !result )
     {
         owarn << "DebugMapper::map() - value " << value << " is not found." << oendl;
         return QString::null;
     }
     else
     {
         return *result;
     }
 }
 
 """
 
 #---------------------------------------------------------------------------#
 #                                                                           #
 #---------------------------------------------------------------------------#
 
 def regenManufacturerDB( basename ):
 
     try:
         h = file( basename+".h", "w" )