Initial changes for mmbox, addition of removed autoconf files...

2005-03-16 05:04:03 +00:00 · 2005-03-16 05:04:03 +00:00 · 05a5863013
parent 9112b7f312
commit 05a5863013
14 changed files with 10992 additions and 89 deletions
--- a/mbuni/config.guess
+++ b/mbuni/config.guess
--- a/mbuni/config.sub
+++ b/mbuni/config.sub
--- a/mbuni/configure.ac
+++ b/mbuni/configure.ac
@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.

 AC_PREREQ(2.59)
-AC_INIT(mbuni, 0.96, devel@mbuni.org)
+AC_INIT(mbuni, cvs, devel@mbuni.org)
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([mmlib/mms_util.c])
 AC_CONFIG_HEADER([config.h])
@ -62,7 +62,7 @@ case "$host" in
    ;;
  *apple-darwin*) 
    CFLAGS="$CFLAGS -DDARWIN=1" 
-    LIBTOOL="libtool -static -o" 
+  #  LIBTOOL="libtool -static -o" 
    ;;
  *-linux-*)
    CFLAGS="$CFLAGS -D_XOPEN_SOURCE=600 -D_BSD_SOURCE"
@ -75,7 +75,7 @@ case "$host" in
 esac

 AC_SUBST(EXE_EXT)
-# AC_SUBST(LIBTOOL)
+AC_SUBST(LIBTOOL)

 AC_ARG_WITH(cflags,
 [  --with-cflags=FLAGS     use FLAGS for CFLAGS],
--- a/mbuni/depcomp
+++ b/mbuni/depcomp
@ -0,0 +1,520 @@
+#! /bin/sh
+# depcomp - compile a program generating dependencies as side-effects
+
+scriptversion=2003-11-08.23
+
+# Copyright (C) 1999, 2000, 2003 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
+
+case $1 in
+  '')
+     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: depcomp [--help] [--version] PROGRAM [ARGS]
+
+Run PROGRAMS ARGS to compile a file, generating dependencies
+as side-effects.
+
+Environment variables:
+  depmode     Dependency tracking mode.
+  source      Source file read by `PROGRAMS ARGS'.
+  object      Object file output by `PROGRAMS ARGS'.
+  depfile     Dependency file to output.
+  tmpdepfile  Temporary file to use when outputing dependencies.
+  libtool     Whether libtool is used (yes/no).
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit 0
+    ;;
+  -v | --v*)
+    echo "depcomp $scriptversion"
+    exit 0
+    ;;
+esac
+
+if test -z "$depmode" || test -z "$source" || test -z "$object"; then
+  echo "depcomp: Variables source, object and depmode must be set" 1>&2
+  exit 1
+fi
+# `libtool' can also be set to `yes' or `no'.
+
+if test -z "$depfile"; then
+   base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'`
+   dir=`echo "$object" | sed 's,/.*$,/,'`
+   if test "$dir" = "$object"; then
+      dir=
+   fi
+   # FIXME: should be _deps on DOS.
+   depfile="$dir.deps/$base"
+fi
+
+tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
+
+rm -f "$tmpdepfile"
+
+# Some modes work just like other modes, but use different flags.  We
+# parameterize here, but still list the modes in the big case below,
+# to make depend.m4 easier to write.  Note that we *cannot* use a case
+# here, because this file can only contain one case statement.
+if test "$depmode" = hp; then
+  # HP compiler uses -M and no extra arg.
+  gccflag=-M
+  depmode=gcc
+fi
+
+if test "$depmode" = dashXmstdout; then
+   # This is just like dashmstdout with a different argument.
+   dashmflag=-xM
+   depmode=dashmstdout
+fi
+
+case "$depmode" in
+gcc3)
+## gcc 3 implements dependency tracking that does exactly what
+## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
+## it if -MD -MP comes after the -MF stuff.  Hmm.
+  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  mv "$tmpdepfile" "$depfile"
+  ;;
+
+gcc)
+## There are various ways to get dependency output from gcc.  Here's
+## why we pick this rather obscure method:
+## - Don't want to use -MD because we'd like the dependencies to end
+##   up in a subdir.  Having to rename by hand is ugly.
+##   (We might end up doing this anyway to support other compilers.)
+## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
+##   -MM, not -M (despite what the docs say).
+## - Using -M directly means running the compiler twice (even worse
+##   than renaming).
+  if test -z "$gccflag"; then
+    gccflag=-MD,
+  fi
+  "$@" -Wp,"$gccflag$tmpdepfile"
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
+## The second -e expression handles DOS-style file names with drive letters.
+  sed -e 's/^[^:]*: / /' \
+      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
+## This next piece of magic avoids the `deleted header file' problem.
+## The problem is that when a header file which appears in a .P file
+## is deleted, the dependency causes make to die (because there is
+## typically no way to rebuild the header).  We avoid this by adding
+## dummy dependencies for each header file.  Too bad gcc doesn't do
+## this for us directly.
+  tr ' ' '
+' < "$tmpdepfile" |
+## Some versions of gcc put a space before the `:'.  On the theory
+## that the space means something, we add a space to the output as
+## well.
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+hp)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+sgi)
+  if test "$libtool" = yes; then
+    "$@" "-Wp,-MDupdate,$tmpdepfile"
+  else
+    "$@" -MDupdate "$tmpdepfile"
+  fi
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+
+  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
+    echo "$object : \\" > "$depfile"
+
+    # Clip off the initial element (the dependent).  Don't try to be
+    # clever and replace this with sed code, as IRIX sed won't handle
+    # lines with more than a fixed number of characters (4096 in
+    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
+    # the IRIX cc adds comments like `#:fec' to the end of the
+    # dependency line.
+    tr ' ' '
+' < "$tmpdepfile" \
+    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
+    tr '
+' ' ' >> $depfile
+    echo >> $depfile
+
+    # The second pass generates a dummy entry for each header file.
+    tr ' ' '
+' < "$tmpdepfile" \
+   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+   >> $depfile
+  else
+    # The sourcefile does not contain any dependencies, so just
+    # store a dummy comment line, to avoid errors with the Makefile
+    # "include basename.Plo" scheme.
+    echo "#dummy" > "$depfile"
+  fi
+  rm -f "$tmpdepfile"
+  ;;
+
+aix)
+  # The C for AIX Compiler uses -M and outputs the dependencies
+  # in a .u file.  In older versions, this file always lives in the
+  # current directory.  Also, the AIX compiler puts `$object:' at the
+  # start of each line; $object doesn't have directory information.
+  # Version 6 uses the directory in both cases.
+  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
+  tmpdepfile="$stripped.u"
+  if test "$libtool" = yes; then
+    "$@" -Wc,-M
+  else
+    "$@" -M
+  fi
+  stat=$?
+
+  if test -f "$tmpdepfile"; then :
+  else
+    stripped=`echo "$stripped" | sed 's,^.*/,,'`
+    tmpdepfile="$stripped.u"
+  fi
+
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+
+  if test -f "$tmpdepfile"; then
+    outname="$stripped.o"
+    # Each line is of the form `foo.o: dependent.h'.
+    # Do two passes, one to just change these to
+    # `$object: dependent.h' and one to simply `dependent.h:'.
+    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
+    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
+  else
+    # The sourcefile does not contain any dependencies, so just
+    # store a dummy comment line, to avoid errors with the Makefile
+    # "include basename.Plo" scheme.
+    echo "#dummy" > "$depfile"
+  fi
+  rm -f "$tmpdepfile"
+  ;;
+
+icc)
+  # Intel's C compiler understands `-MD -MF file'.  However on
+  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
+  # ICC 7.0 will fill foo.d with something like
+  #    foo.o: sub/foo.c
+  #    foo.o: sub/foo.h
+  # which is wrong.  We want:
+  #    sub/foo.o: sub/foo.c
+  #    sub/foo.o: sub/foo.h
+  #    sub/foo.c:
+  #    sub/foo.h:
+  # ICC 7.1 will output
+  #    foo.o: sub/foo.c sub/foo.h
+  # and will wrap long lines using \ :
+  #    foo.o: sub/foo.c ... \
+  #     sub/foo.h ... \
+  #     ...
+
+  "$@" -MD -MF "$tmpdepfile"
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  # Each line is of the form `foo.o: dependent.h',
+  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
+  # Do two passes, one to just change these to
+  # `$object: dependent.h' and one to simply `dependent.h:'.
+  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
+    sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+tru64)
+   # The Tru64 compiler uses -MD to generate dependencies as a side
+   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
+   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+   # dependencies in `foo.d' instead, so we check for that too.
+   # Subdirectories are respected.
+   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+   test "x$dir" = "x$object" && dir=
+   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+
+   if test "$libtool" = yes; then
+      tmpdepfile1="$dir.libs/$base.lo.d"
+      tmpdepfile2="$dir.libs/$base.d"
+      "$@" -Wc,-MD
+   else
+      tmpdepfile1="$dir$base.o.d"
+      tmpdepfile2="$dir$base.d"
+      "$@" -MD
+   fi
+
+   stat=$?
+   if test $stat -eq 0; then :
+   else
+      rm -f "$tmpdepfile1" "$tmpdepfile2"
+      exit $stat
+   fi
+
+   if test -f "$tmpdepfile1"; then
+      tmpdepfile="$tmpdepfile1"
+   else
+      tmpdepfile="$tmpdepfile2"
+   fi
+   if test -f "$tmpdepfile"; then
+      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+      # That's a tab and a space in the [].
+      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+   else
+      echo "#dummy" > "$depfile"
+   fi
+   rm -f "$tmpdepfile"
+   ;;
+
+#nosideeffect)
+  # This comment above is used by automake to tell side-effect
+  # dependency tracking mechanisms from slower ones.
+
+dashmstdout)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout, regardless of -o.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test $1 != '--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove `-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
+      ;;
+    esac
+  done
+
+  test -z "$dashmflag" && dashmflag=-M
+  # Require at least two characters before searching for `:'
+  # in the target name.  This is to cope with DOS-style filenames:
+  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
+  "$@" $dashmflag |
+    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
+  rm -f "$depfile"
+  cat < "$tmpdepfile" > "$depfile"
+  tr ' ' '
+' < "$tmpdepfile" | \
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+dashXmstdout)
+  # This case only exists to satisfy depend.m4.  It is never actually
+  # run, as this mode is specially recognized in the preamble.
+  exit 1
+  ;;
+
+makedepend)
+  "$@" || exit $?
+  # Remove any Libtool call
+  if test "$libtool" = yes; then
+    while test $1 != '--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+  # X makedepend
+  shift
+  cleared=no
+  for arg in "$@"; do
+    case $cleared in
+    no)
+      set ""; shift
+      cleared=yes ;;
+    esac
+    case "$arg" in
+    -D*|-I*)
+      set fnord "$@" "$arg"; shift ;;
+    # Strip any option that makedepend may not understand.  Remove
+    # the object too, otherwise makedepend will parse it as a source file.
+    -*|$object)
+      ;;
+    *)
+      set fnord "$@" "$arg"; shift ;;
+    esac
+  done
+  obj_suffix="`echo $object | sed 's/^.*\././'`"
+  touch "$tmpdepfile"
+  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
+  rm -f "$depfile"
+  cat < "$tmpdepfile" > "$depfile"
+  sed '1,2d' "$tmpdepfile" | tr ' ' '
+' | \
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile" "$tmpdepfile".bak
+  ;;
+
+cpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test $1 != '--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove `-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
+      ;;
+    esac
+  done
+
+  "$@" -E |
+    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
+    sed '$ s: \\$::' > "$tmpdepfile"
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  cat < "$tmpdepfile" >> "$depfile"
+  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvisualcpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout, regardless of -o,
+  # because we must use -o when running libtool.
+  "$@" || exit $?
+  IFS=" "
+  for arg
+  do
+    case "$arg" in
+    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
+	set fnord "$@"
+	shift
+	shift
+	;;
+    *)
+	set fnord "$@" "$arg"
+	shift
+	shift
+	;;
+    esac
+  done
+  "$@" -E |
+  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
+  echo "	" >> "$depfile"
+  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+none)
+  exec "$@"
+  ;;
+
+*)
+  echo "Unknown depmode $depmode" 1>&2
+  exit 1
+  ;;
+esac
+
+exit 0
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
--- a/mbuni/install-sh
+++ b/mbuni/install-sh
@ -0,0 +1,316 @@
+#!/bin/sh
+# install - install a program, script, or datafile
+
+scriptversion=2004-02-15.20
+
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
+# following copyright and license.
+#
+# Copyright (C) 1994 X Consortium
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of the X Consortium shall not
+# be used in advertising or otherwise to promote the sale, use or other deal-
+# ings in this Software without prior written authorization from the X Consor-
+# tium.
+#
+#
+# FSF changes to this file are in the public domain.
+#
+# Calling this script install-sh is preferred over install.sh, to prevent
+# `make' implicit rules from creating a file called install from it
+# when there is no Makefile.
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch.  It can only install one file at a time, a restriction
+# shared with many OS's install programs.
+
+# set DOITPROG to echo to test this script
+
+# Don't use :- since 4.3BSD and earlier shells don't like it.
+doit="${DOITPROG-}"
+
+# put in absolute paths if you don't have them in your path; or use env. vars.
+
+mvprog="${MVPROG-mv}"
+cpprog="${CPPROG-cp}"
+chmodprog="${CHMODPROG-chmod}"
+chownprog="${CHOWNPROG-chown}"
+chgrpprog="${CHGRPPROG-chgrp}"
+stripprog="${STRIPPROG-strip}"
+rmprog="${RMPROG-rm}"
+mkdirprog="${MKDIRPROG-mkdir}"
+
+transformbasename=
+transform_arg=
+instcmd="$mvprog"
+chmodcmd="$chmodprog 0755"
+chowncmd=
+chgrpcmd=
+stripcmd=
+rmcmd="$rmprog -f"
+mvcmd="$mvprog"
+src=
+dst=
+dir_arg=
+
+usage="Usage: $0 [OPTION]... SRCFILE DSTFILE
+   or: $0 [OPTION]... SRCFILES... DIRECTORY
+   or: $0 -d DIRECTORIES...
+
+In the first form, install SRCFILE to DSTFILE, removing SRCFILE by default.
+In the second, create the directory path DIR.
+
+Options:
+-b=TRANSFORMBASENAME
+-c         copy source (using $cpprog) instead of moving (using $mvprog).
+-d         create directories instead of installing files.
+-g GROUP   $chgrp installed files to GROUP.
+-m MODE    $chmod installed files to MODE.
+-o USER    $chown installed files to USER.
+-s         strip installed files (using $stripprog).
+-t=TRANSFORM
+--help     display this help and exit.
+--version  display version info and exit.
+
+Environment variables override the default commands:
+  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
+"
+
+while test -n "$1"; do
+  case $1 in
+    -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
+        shift
+        continue;;
+
+    -c) instcmd=$cpprog
+        shift
+        continue;;
+
+    -d) dir_arg=true
+        shift
+        continue;;
+
+    -g) chgrpcmd="$chgrpprog $2"
+        shift
+        shift
+        continue;;
+
+    --help) echo "$usage"; exit 0;;
+
+    -m) chmodcmd="$chmodprog $2"
+        shift
+        shift
+        continue;;
+
+    -o) chowncmd="$chownprog $2"
+        shift
+        shift
+        continue;;
+
+    -s) stripcmd=$stripprog
+        shift
+        continue;;
+
+    -t=*) transformarg=`echo $1 | sed 's/-t=//'`
+        shift
+        continue;;
+
+    --version) echo "$0 $scriptversion"; exit 0;;
+
+    *)  # When -d is used, all remaining arguments are directories to create.
+	test -n "$dir_arg" && break
+        # Otherwise, the last argument is the destination.  Remove it from $@.
+	for arg
+	do
+          if test -n "$dstarg"; then
+	    # $@ is not empty: it contains at least $arg.
+	    set fnord "$@" "$dstarg"
+	    shift # fnord
+	  fi
+	  shift # arg
+	  dstarg=$arg
+	done
+	break;;
+  esac
+done
+
+if test -z "$1"; then
+  if test -z "$dir_arg"; then
+    echo "$0: no input file specified." >&2
+    exit 1
+  fi
+  # It's OK to call `install-sh -d' without argument.
+  # This can happen when creating conditional directories.
+  exit 0
+fi
+
+for src
+do
+  # Protect names starting with `-'.
+  case $src in
+    -*) src=./$src ;;
+  esac
+
+  if test -n "$dir_arg"; then
+    dst=$src
+    src=
+
+    if test -d "$dst"; then
+      instcmd=:
+      chmodcmd=
+    else
+      instcmd=$mkdirprog
+    fi
+  else
+    # Waiting for this to be detected by the "$instcmd $src $dsttmp" command
+    # might cause directories to be created, which would be especially bad
+    # if $src (and thus $dsttmp) contains '*'.
+    if test ! -f "$src" && test ! -d "$src"; then
+      echo "$0: $src does not exist." >&2
+      exit 1
+    fi
+
+    if test -z "$dstarg"; then
+      echo "$0: no destination specified." >&2
+      exit 1
+    fi
+
+    dst=$dstarg
+    # Protect names starting with `-'.
+    case $dst in
+      -*) dst=./$dst ;;
+    esac
+
+    # If destination is a directory, append the input filename; won't work
+    # if double slashes aren't ignored.
+    if test -d "$dst"; then
+      dst=$dst/`basename "$src"`
+    fi
+  fi
+
+  # This sed command emulates the dirname command.
+  dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+
+  # Make sure that the destination directory exists.
+
+  # Skip lots of stat calls in the usual case.
+  if test ! -d "$dstdir"; then
+    defaultIFS='
+	 '
+    IFS="${IFS-$defaultIFS}"
+
+    oIFS=$IFS
+    # Some sh's can't handle IFS=/ for some reason.
+    IFS='%'
+    set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+    IFS=$oIFS
+
+    pathcomp=
+
+    while test $# -ne 0 ; do
+      pathcomp=$pathcomp$1
+      shift
+      if test ! -d "$pathcomp"; then
+        $mkdirprog "$pathcomp" || lasterr=$?
+	# mkdir can fail with a `File exist' error in case several
+	# install-sh are creating the directory concurrently.  This
+	# is OK.
+	test ! -d "$pathcomp" && { (exit ${lasterr-1}); exit; }
+      fi
+      pathcomp=$pathcomp/
+    done
+  fi
+
+  if test -n "$dir_arg"; then
+    $doit $instcmd "$dst" \
+      && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
+      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
+      && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
+      && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
+
+  else
+    # If we're going to rename the final executable, determine the name now.
+    if test -z "$transformarg"; then
+      dstfile=`basename "$dst"`
+    else
+      dstfile=`basename "$dst" $transformbasename \
+               | sed $transformarg`$transformbasename
+    fi
+
+    # don't allow the sed command to completely eliminate the filename.
+    test -z "$dstfile" && dstfile=`basename "$dst"`
+
+    # Make a couple of temp file names in the proper directory.
+    dsttmp=$dstdir/_inst.$$_
+    rmtmp=$dstdir/_rm.$$_
+
+    # Trap to clean up those temp files at exit.
+    trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
+    trap '(exit $?); exit' 1 2 13 15
+
+    # Move or copy the file name to the temp name
+    $doit $instcmd "$src" "$dsttmp" &&
+
+    # and set any options; do chmod last to preserve setuid bits.
+    #
+    # If any of these fail, we abort the whole thing.  If we want to
+    # ignore errors from any of these, just make sure not to ignore
+    # errors from the above "$doit $instcmd $src $dsttmp" command.
+    #
+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
+      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
+      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
+      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
+
+    # Now remove or move aside any old file at destination location.  We
+    # try this two ways since rm can't unlink itself on some systems and
+    # the destination file might be busy for other reasons.  In this case,
+    # the final cleanup might fail but the new file should still install
+    # successfully.
+    {
+      if test -f "$dstdir/$dstfile"; then
+        $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
+        || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
+        || {
+	  echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
+	  (exit 1); exit
+        }
+      else
+        :
+      fi
+    } &&
+
+    # Now rename the file to the real destination.
+    $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
+  fi || { (exit 1); exit; }
+done
+
+# The final little trick to "correctly" pass the exit status to the exit trap.
+{
+  (exit 0); exit
+}
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
--- a/mbuni/ltmain.sh
+++ b/mbuni/ltmain.sh
--- a/mbuni/missing
+++ b/mbuni/missing
@ -0,0 +1,360 @@
+#! /bin/sh
+# Common stub for a few missing GNU programs while installing.
+
+scriptversion=2003-09-02.23
+
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 
+#   Free Software Foundation, Inc.
+# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+if test $# -eq 0; then
+  echo 1>&2 "Try \`$0 --help' for more information"
+  exit 1
+fi
+
+run=:
+
+# In the cases where this matters, `missing' is being run in the
+# srcdir already.
+if test -f configure.ac; then
+  configure_ac=configure.ac
+else
+  configure_ac=configure.in
+fi
+
+msg="missing on your system"
+
+case "$1" in
+--run)
+  # Try to run requested program, and just exit if it succeeds.
+  run=
+  shift
+  "$@" && exit 0
+  # Exit code 63 means version mismatch.  This often happens
+  # when the user try to use an ancient version of a tool on
+  # a file that requires a minimum version.  In this case we
+  # we should proceed has if the program had been absent, or
+  # if --run hadn't been passed.
+  if test $? = 63; then
+    run=:
+    msg="probably too old"
+  fi
+  ;;
+esac
+
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case "$1" in
+
+  -h|--h|--he|--hel|--help)
+    echo "\
+$0 [OPTION]... PROGRAM [ARGUMENT]...
+
+Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
+error status if there is no known handling for PROGRAM.
+
+Options:
+  -h, --help      display this help and exit
+  -v, --version   output version information and exit
+  --run           try to run the given command, and emulate it if it fails
+
+Supported PROGRAM values:
+  aclocal      touch file \`aclocal.m4'
+  autoconf     touch file \`configure'
+  autoheader   touch file \`config.h.in'
+  automake     touch all \`Makefile.in' files
+  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
+  flex         create \`lex.yy.c', if possible, from existing .c
+  help2man     touch the output file
+  lex          create \`lex.yy.c', if possible, from existing .c
+  makeinfo     touch the output file
+  tar          try tar, gnutar, gtar, then tar without non-portable flags
+  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
+
+Send bug reports to <bug-automake@gnu.org>."
+    ;;
+
+  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
+    echo "missing $scriptversion (GNU Automake)"
+    ;;
+
+  -*)
+    echo 1>&2 "$0: Unknown \`$1' option"
+    echo 1>&2 "Try \`$0 --help' for more information"
+    exit 1
+    ;;
+
+  aclocal*)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    fi
+
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
+         to install the \`Automake' and \`Perl' packages.  Grab them from
+         any GNU archive site."
+    touch aclocal.m4
+    ;;
+
+  autoconf)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    fi
+
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`${configure_ac}'.  You might want to install the
+         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
+         archive site."
+    touch configure
+    ;;
+
+  autoheader)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    fi
+
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
+         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
+         from any GNU archive site."
+    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
+    test -z "$files" && files="config.h"
+    touch_files=
+    for f in $files; do
+      case "$f" in
+      *:*) touch_files="$touch_files "`echo "$f" |
+				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
+      *) touch_files="$touch_files $f.in";;
+      esac
+    done
+    touch $touch_files
+    ;;
+
+  automake*)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    fi
+
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
+         You might want to install the \`Automake' and \`Perl' packages.
+         Grab them from any GNU archive site."
+    find . -type f -name Makefile.am -print |
+	   sed 's/\.am$/.in/' |
+	   while read f; do touch "$f"; done
+    ;;
+
+  autom4te)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    fi
+
+    echo 1>&2 "\
+WARNING: \`$1' is needed, but is $msg.
+         You might have modified some files without having the
+         proper tools for further handling them.
+         You can get \`$1' as part of \`Autoconf' from any GNU
+         archive site."
+
+    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
+    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+    if test -f "$file"; then
+	touch $file
+    else
+	test -z "$file" || exec >$file
+	echo "#! /bin/sh"
+	echo "# Created by GNU Automake missing as a replacement of"
+	echo "#  $ $@"
+	echo "exit 0"
+	chmod +x $file
+	exit 1
+    fi
+    ;;
+
+  bison|yacc)
+    echo 1>&2 "\
+WARNING: \`$1' $msg.  You should only need it if
+         you modified a \`.y' file.  You may need the \`Bison' package
+         in order for those modifications to take effect.  You can get
+         \`Bison' from any GNU archive site."
+    rm -f y.tab.c y.tab.h
+    if [ $# -ne 1 ]; then
+        eval LASTARG="\${$#}"
+	case "$LASTARG" in
+	*.y)
+	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
+	    if [ -f "$SRCFILE" ]; then
+	         cp "$SRCFILE" y.tab.c
+	    fi
+	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
+	    if [ -f "$SRCFILE" ]; then
+	         cp "$SRCFILE" y.tab.h
+	    fi
+	  ;;
+	esac
+    fi
+    if [ ! -f y.tab.h ]; then
+	echo >y.tab.h
+    fi
+    if [ ! -f y.tab.c ]; then
+	echo 'main() { return 0; }' >y.tab.c
+    fi
+    ;;
+
+  lex|flex)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified a \`.l' file.  You may need the \`Flex' package
+         in order for those modifications to take effect.  You can get
+         \`Flex' from any GNU archive site."
+    rm -f lex.yy.c
+    if [ $# -ne 1 ]; then
+        eval LASTARG="\${$#}"
+	case "$LASTARG" in
+	*.l)
+	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
+	    if [ -f "$SRCFILE" ]; then
+	         cp "$SRCFILE" lex.yy.c
+	    fi
+	  ;;
+	esac
+    fi
+    if [ ! -f lex.yy.c ]; then
+	echo 'main() { return 0; }' >lex.yy.c
+    fi
+    ;;
+
+  help2man)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    fi
+
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+	 you modified a dependency of a manual page.  You may need the
+	 \`Help2man' package in order for those modifications to take
+	 effect.  You can get \`Help2man' from any GNU archive site."
+
+    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+    if test -z "$file"; then
+	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
+    fi
+    if [ -f "$file" ]; then
+	touch $file
+    else
+	test -z "$file" || exec >$file
+	echo ".ab help2man is required to generate this page"
+	exit 1
+    fi
+    ;;
+
+  makeinfo)
+    if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
+       # We have makeinfo, but it failed.
+       exit 1
+    fi
+
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified a \`.texi' or \`.texinfo' file, or any other file
+         indirectly affecting the aspect of the manual.  The spurious
+         call might also be the consequence of using a buggy \`make' (AIX,
+         DU, IRIX).  You might want to install the \`Texinfo' package or
+         the \`GNU make' package.  Grab either from any GNU archive site."
+    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+    if test -z "$file"; then
+      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
+    fi
+    touch $file
+    ;;
+
+  tar)
+    shift
+    if test -n "$run"; then
+      echo 1>&2 "ERROR: \`tar' requires --run"
+      exit 1
+    fi
+
+    # We have already tried tar in the generic part.
+    # Look for gnutar/gtar before invocation to avoid ugly error
+    # messages.
+    if (gnutar --version > /dev/null 2>&1); then
+       gnutar "$@" && exit 0
+    fi
+    if (gtar --version > /dev/null 2>&1); then
+       gtar "$@" && exit 0
+    fi
+    firstarg="$1"
+    if shift; then
+	case "$firstarg" in
+	*o*)
+	    firstarg=`echo "$firstarg" | sed s/o//`
+	    tar "$firstarg" "$@" && exit 0
+	    ;;
+	esac
+	case "$firstarg" in
+	*h*)
+	    firstarg=`echo "$firstarg" | sed s/h//`
+	    tar "$firstarg" "$@" && exit 0
+	    ;;
+	esac
+    fi
+
+    echo 1>&2 "\
+WARNING: I can't seem to be able to run \`tar' with the given arguments.
+         You may want to install GNU tar or Free paxutils, or check the
+         command line arguments."
+    exit 1
+    ;;
+
+  *)
+    echo 1>&2 "\
+WARNING: \`$1' is needed, and is $msg.
+         You might have modified some files without having the
+         proper tools for further handling them.  Check the \`README' file,
+         it often tells you about the needed prerequisites for installing
+         this package.  You may also peek at any GNU archive site, in case
+         some other package would contain this missing \`$1' program."
+    exit 1
+    ;;
+esac
+
+exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
--- a/mbuni/mmlib/Makefile.am
+++ b/mbuni/mmlib/Makefile.am
@ -2,8 +2,8 @@ noinst_LIBRARIES = libmms.a
 libmms_a_SOURCES = mms_billing.c mms_billing.h mms_msg.c mms_msg.h mms_queue.c mms_queue.h mms_strings.c mms_strings.h mms_uaprof.c mms_uaprof.h mms_util.c mms_util.h mms_resolve.c

 plugindir = $(libdir)/mbuni
-plugin_LTLIBRARIES = libmms_billing_shell.la libmms_resolve_shell.la libmms_resolve_all_local.la libmms_detokenize_shell.la
+plugin_LTLIBRARIES = libmms_billing_shell.la libmms_resolve_shell.la libmms_detokenize_shell.la
 libmms_billing_shell_la_SOURCES = mms_billing_shell.c
 libmms_resolve_shell_la_SOURCES = mms_resolve_shell.c
-libmms_resolve_all_local_la_SOURCES = mms_resolve_all_local.c
+# libmms_resolve_all_local_la_SOURCES = mms_resolve_all_local.c
 libmms_detokenize_shell_la_SOURCES = mms_detokenize_shell.c
--- a/mbuni/mmlib/mms_msg.c
+++ b/mbuni/mmlib/mms_msg.c
@ -22,12 +22,13 @@ struct MmsMsg {
 #define SIZHINT 47

 static void mm_destroy(MIMEEntity *mx);
-static void pack_short_integer(Octstr *s, int ch)
-{
-     unsigned char c = ch|0x80;

-     octstr_append_data(s, &c, 1);
+static inline void pack_short_integer(Octstr *s, int ch)
+{
+     unsigned long c = ch&0x7f;
+     wsp_pack_short_integer(s, c);
 }
+
 #if 0
 static void encode_uint(Octstr *os, unsigned int l)
 {
@ -192,7 +193,35 @@ static void encode_msgbody(Octstr *os, MmsMsg *msg)
 	  octstr_append(os, msg->body.s);
 }

-/* Decodes it and returns the value, which is a pointer into the string so be careful! */
+/* If ret < 0 then we need to get a field value, else we use what's passed. */
+static Octstr *decode_encoded_string_value(int ret, ParseContext *context, char *hname)
+{
+     int val;
+     int ret2;
+     Octstr *res = NULL;
+     
+     ret2 = (ret < 0) ?  wsp_field_value(context, &val) : ret;
+     
+     if (ret2 == WSP_FIELD_VALUE_DATA) { /* expect charset text. */
+	  long charset; /* Get it and ignore it. */
+	  wsp_secondary_field_value(context, &charset);
+	  res = parse_get_nul_string(context); /* XXX Currently we ignore charset */
+
+	  if (ret < 0) {
+	       parse_skip_to_limit(context);
+	       parse_pop_limit(context);
+	  }
+
+     } else if (ret2 != WSP_FIELD_VALUE_NUL_STRING) {
+	  warning(0, "Faulty header value for %s!\n", hname);
+	  res = octstr_imm("");
+     } else 
+	  res = parse_get_nul_string(context);
+     
+     return res;
+}
+
+/* Decodes it, adds to 'unpacked' which is the header list. */
 static void mms_unpack_well_known_field(List *unpacked, int field_type,
 					ParseContext *context, Octstr *xfrom)
 {
@ -220,15 +249,8 @@ static void mms_unpack_well_known_field(List *unpacked, int field_type,
     case MMS_HEADER_TO:
     case MMS_HEADER_CC:
     case MMS_HEADER_BCC:
-
-	  if (ret == WSP_FIELD_VALUE_DATA) { /* expect charset text. */
-	       long charset; /* Get it and ignore it. */
-	       wsp_secondary_field_value(context, &charset);
-	       decoded = parse_get_nul_string(context);
-	  } else if (ret != WSP_FIELD_VALUE_NUL_STRING) {
-	       warning(0, "Faulty header value for %s!\n", hname);
-	       decoded = octstr_imm("");
-	  }
+	  
+	  decoded = decode_encoded_string_value(ret, context, hname);

 	  if (mms_validate_address(decoded))
 	       warning(0, "Faulty address [%s] format in field %s!", 
@ -237,18 +259,12 @@ static void mms_unpack_well_known_field(List *unpacked, int field_type,
     case MMS_HEADER_SUBJECT:
     case MMS_HEADER_RESPONSE_TEXT:
     case MMS_HEADER_RETRIEVE_TEXT:
-
-	  if (ret == WSP_FIELD_VALUE_DATA) { /* encoded string, expect charset then text. */
-	       long charset; /* Get it and ignore it. */
-	       wsp_secondary_field_value(context, &charset);
-	       decoded = parse_get_nul_string(context);
-	  } else if (ret != WSP_FIELD_VALUE_NUL_STRING) {
-	       warning(0, "Faulty header value for %s!\n", hname);
-	       decoded = octstr_imm("");
-	  }	  
+	  
+     case MMS_HEADER_STORE_STATUS_TEXT:
+	  
+	  decoded = decode_encoded_string_value(ret, context, hname);
 	  break;
     case MMS_HEADER_TRANSACTION_ID:
-     case MMS_HEADER_CONTENT_LOCATION:
     case MMS_HEADER_MESSAGE_ID:
     case MMS_HEADER_REPLY_CHARGING_ID:
 	  if (ret != WSP_FIELD_VALUE_NUL_STRING)
@ -256,6 +272,21 @@ static void mms_unpack_well_known_field(List *unpacked, int field_type,
 		       ret, hname);
 	  
 	  break;	       
+
+	  /* MMS v1.2 mandates slightly different format,
+	   * when used in m-mbox-delete.conf
+	   */
+     case MMS_HEADER_CONTENT_LOCATION:
+	  if (ret == WSP_FIELD_VALUE_DATA) {
+	       Octstr *t;
+	       decoded = wsp_unpack_integer_value(context);
+	       t = parse_get_nul_string(context);
+	       octstr_append(decoded, t);
+	       octstr_destroy(t);
+	  } else if (ret != WSP_FIELD_VALUE_NUL_STRING)
+	       warning(0, "Unexpected field value type %d for header %s\n",
+		       ret, hname);	  
+	  break;
     case MMS_HEADER_MMS_VERSION:
 	  if (ret == WSP_FIELD_VALUE_ENCODED)
 	       decoded = wsp_unpack_version_value(val);
@ -264,6 +295,14 @@ static void mms_unpack_well_known_field(List *unpacked, int field_type,
     case MMS_HEADER_DELIVERY_REPORT:	 
     case MMS_HEADER_REPORT_ALLOWED:
     case MMS_HEADER_READ_REPORT:
+
+     case MMS_HEADER_DISTRIBUTION_INDICATOR:
+     case MMS_HEADER_QUOTAS:
+
+     case MMS_HEADER_STORE:
+     case MMS_HEADER_STORED:
+     case MMS_HEADER_TOTALS:
+	  
 	  ch = mms_reports_to_cstr(val);
 	  break;
     case MMS_HEADER_MESSAGE_TYPE:
@ -302,6 +341,12 @@ static void mms_unpack_well_known_field(List *unpacked, int field_type,
 	  break;	  

     case MMS_HEADER_MESSAGE_SIZE:
+     case MMS_HEADER_REPLY_CHARGING_SIZE:
+     case MMS_HEADER_START:
+
+     case MMS_HEADER_LIMIT:
+     case MMS_HEADER_MESSAGE_COUNT:
+
 	  parse_skip(context, -1); 
 	  decoded = wsp_unpack_integer_value(context);
 	  break;
@ -349,20 +394,7 @@ static void mms_unpack_well_known_field(List *unpacked, int field_type,
 		    int n = parse_get_char(context);
 		    
 		    if (n == 0x80) { /* Address present. */
-			 int val = 0;
-			 int ret2 = wsp_field_value(context, &val);
-
-			 if (ret2 == WSP_FIELD_VALUE_DATA) { /* expect charset text. */
-			      long charset; /* Get it and ignore it. */
-			      wsp_secondary_field_value(context, &charset);
-			      decoded = parse_get_nul_string(context);
-			      parse_skip_to_limit(context);
-			      parse_pop_limit(context);
-			 } else if (ret2 != WSP_FIELD_VALUE_NUL_STRING) {
-			      warning(0, "Faulty header value for %s!\n", hname);
-			      decoded = octstr_imm("");
-			 } else 
-			      decoded = parse_get_nul_string(context);
+			 decoded = decode_encoded_string_value(-1,context, hname);
 			 if (mms_validate_address(decoded))
 			      warning(0, "Faulty address [%s] format in field %s!", 
 				      octstr_get_cstr(decoded), hname);			 
@ -378,28 +410,97 @@ static void mms_unpack_well_known_field(List *unpacked, int field_type,
 	       Octstr *t;
 	       decoded = wsp_unpack_integer_value(context);
 	       
-	       if (field_type == MMS_HEADER_PREVIOUSLY_SENT_BY) { 		
-		    int val = 0;
-		    int ret2 = wsp_field_value(context, &val);
-		    
-		    if (ret2 == WSP_FIELD_VALUE_DATA) { /* expect charset text. */
-			 long charset; /* Get it and ignore it. */
-			 wsp_secondary_field_value(context, &charset);
-			 t = parse_get_nul_string(context);
-			 parse_skip_to_limit(context);
-			 parse_pop_limit(context);
-		    } else if (ret2 != WSP_FIELD_VALUE_NUL_STRING) {
-			 warning(0, "Faulty header value for %s!\n", hname);
-			 t = octstr_imm("");
-		    } else 
-			 t = parse_get_nul_string(context);
-	      }  else
+	       if (field_type == MMS_HEADER_PREVIOUSLY_SENT_BY) 
+		    t = decode_encoded_string_value(ret, context, hname);
+	       else
 		    t = wsp_unpack_date_value(context);
 	       
 	       octstr_append(decoded, t);
 	       octstr_destroy(t);
 	  }
-     break;     
+	  break;  
+     /* From here on, these are MMS v1.2 thingies. a few are above as well... */
+     case MMS_HEADER_ATTRIBUTES:
+	  ch = mms_header_to_cstr(val);
+	  break;
+
+     case MMS_HEADER_ELEMENT_DESCRIPTOR:
+	  if (ret != WSP_FIELD_VALUE_DATA)
+	       warning(0, "Faulty header value for %s!\n", hname);
+	  else { /* We expect a content reference and a list of parameters. */
+	       Octstr *cr = parse_get_nul_string(context);
+	       List *params = http_create_empty_headers();
+	       Octstr *ps;
+	       while (parse_octets_left(context) > 0) {
+		    int val, ret;
+		    Octstr *pname = NULL, *pval = NULL;
+		    ret = wsp_field_value(context, &val);
+		    if (ret == WSP_FIELD_VALUE_ENCODED)
+			 pname = mms_descriptor_params_to_string(val);
+		    else if (ret == WSP_FIELD_VALUE_NUL_STRING)
+			 pname = parse_get_nul_string(context);
+
+		    if (!pname)
+			 continue;
+		    ret = wsp_field_value(context, &val);
+		    if (ret == WSP_FIELD_VALUE_ENCODED)
+			 pval = wsp_content_type_to_string(val);
+		    else if (ret == WSP_FIELD_VALUE_NUL_STRING)
+			 pval = parse_get_nul_string(context);
+		    
+		    if (pval) {
+			 http_header_add(params, octstr_get_cstr(pname), octstr_get_cstr(pval));
+			 octstr_destroy(pval);
+		    }		    
+		    octstr_destroy(pname);		    
+	       }
+	       ps = make_value_parameters(params);
+	       decoded = octstr_format("%S%s%S", cr, 
+				       (ps && octstr_len(ps) > 0) ? "; " : "", 
+				       ps);
+	       octstr_destroy(cr);
+	       octstr_destroy(ps);
+	       http_destroy_headers(params);
+	  }
+	  break;
+
+     case MMS_HEADER_MBOX_TOTALS:
+     case MMS_HEADER_MBOX_QUOTAS:
+	  if (ret != WSP_FIELD_VALUE_DATA)
+	       warning(0, "Faulty header value for %s!\n", hname);
+	  else {
+	       int n = parse_get_char(context);
+	       decoded = wsp_unpack_integer_value(context);	       
+	       octstr_format_append(decoded, " %s", (n == 0x80) ? "msgs" : "bytes");
+	  }	  
+	  break;
+     case MMS_HEADER_MM_FLAGS:
+	  if (ret != WSP_FIELD_VALUE_DATA)
+	       warning(0, "Faulty header value for %s!\n", hname);
+	  else {
+	       int n = parse_get_char(context);	 
+	       char *s;
+	       Octstr *p;
+	       
+	       if (n == 0x80) /* Add, subtract or filter. */
+		    s = "+";
+	       else if (n == 0x81)
+		    s = "-";
+	       else 
+		    s = "/";
+	       
+	       p = decode_encoded_string_value(-1,context, hname);
+	       decoded = octstr_format("%s%S", s, p);
+	       octstr_destroy(p);
+	  }
+	  break;
+     case MMS_HEADER_MM_STATE:
+	  ch = mms_mm_state_to_cstr(val);
+	  break;
+     case MMS_HEADER_STORE_STATUS:
+	  ch = mms_store_status_to_cstr(val);
+	  break;
+	  
     default:
 	  warning(0, "MMS: Unknown header with code 0x%02x!", field_type);
     }
@ -470,13 +571,35 @@ static void mms_pack_well_known_field(Octstr *os, int field_type, Octstr *value)
     case MMS_HEADER_BCC:
     case MMS_HEADER_SUBJECT:
     case MMS_HEADER_TRANSACTION_ID:
-     case MMS_HEADER_CONTENT_LOCATION:
     case MMS_HEADER_MESSAGE_ID:
     case MMS_HEADER_REPLY_CHARGING_ID:
     case MMS_HEADER_RESPONSE_TEXT:
     case MMS_HEADER_RETRIEVE_TEXT:
-	  wsp_pack_text(os, value);
+
+     case MMS_HEADER_STORE_STATUS_TEXT:
+	  
+	  wsp_pack_text(os, value); /* XXX need to deal with charset issues. */
 	  break;	       
+	  
+     case MMS_HEADER_CONTENT_LOCATION:
+	  if (isdigit(octstr_get_char(value, 0))) { /* begins with number. */
+	       long i, l;
+	       Octstr *s;
+	       i = octstr_parse_long(&l, value, 0, 10);
+	       if (i < 0) {
+		    warning(0, "Bad counter for field %s!", 
+			    mms_header_to_cstr(field_type));
+		    i = 0;
+	       }
+	       wsp_pack_integer_value(encoded, l);
+	       s = octstr_copy(value, i, octstr_len(value));
+	       wsp_pack_text(encoded,s);
+	       wsp_pack_value(os, encoded);
+	       
+	       octstr_destroy(s);
+	  } else
+	       wsp_pack_text(os, value);
+	  break;
     case MMS_HEADER_MMS_VERSION:
 	  wsp_pack_version_value(os, value);
 	  break;
@ -484,6 +607,14 @@ static void mms_pack_well_known_field(Octstr *os, int field_type, Octstr *value)
     case MMS_HEADER_DELIVERY_REPORT:	 
     case MMS_HEADER_REPORT_ALLOWED:
     case MMS_HEADER_READ_REPORT:
+	  
+     case MMS_HEADER_DISTRIBUTION_INDICATOR:
+     case MMS_HEADER_QUOTAS:
+	  
+     case MMS_HEADER_STORE:
+     case MMS_HEADER_STORED:
+     case MMS_HEADER_TOTALS:
+
 	  pack_short_integer(os, mms_string_to_reports(value));
 	  break;
     case MMS_HEADER_MESSAGE_TYPE:
@ -524,6 +655,13 @@ static void mms_pack_well_known_field(Octstr *os, int field_type, Octstr *value)
 	  break;	  

     case MMS_HEADER_MESSAGE_SIZE:
+
+     case MMS_HEADER_REPLY_CHARGING_SIZE:
+     case MMS_HEADER_START:
+
+     case MMS_HEADER_LIMIT:
+     case MMS_HEADER_MESSAGE_COUNT:
+
 	  wsp_pack_integer_string(os, value);
 	  break;
 	  
@ -572,7 +710,6 @@ static void mms_pack_well_known_field(Octstr *os, int field_type, Octstr *value)
 	  Octstr *s;
 	  
 	  i = octstr_parse_long(&l, value, 0, 10);
-
 	  if (i <0) {
 	       warning(0, "Bad counter indicator for field!");
 	       i = 0;
@ -590,6 +727,104 @@ static void mms_pack_well_known_field(Octstr *os, int field_type, Octstr *value)
 	  wsp_pack_value(os, encoded);
     }
     break;     
+
+     case MMS_HEADER_MM_STATE:
+	  pack_short_integer(os, mms_string_to_mm_state(value));
+	  break;
+	  
+     case MMS_HEADER_STORE_STATUS:
+	  pack_short_integer(os, mms_string_to_store_status(value));
+	  break;
+     case MMS_HEADER_MM_FLAGS:
+     {
+	  Octstr *s;
+	  int i = 1;
+	  ch = octstr_get_char(value, 0);
+	  
+	  if (ch == '-') 
+	       wsp_pack_short_integer(encoded, 0x81);
+ 	  else if (ch == '/')
+	       wsp_pack_short_integer(encoded, 0x82);
+	  else if (ch == '+') /* Missing, or '+' ..*/
+	       wsp_pack_short_integer(encoded, 0x80);
+	  else {
+	       i = 0;
+	       wsp_pack_short_integer(encoded, 0x80);
+	  }
+	  s = octstr_copy(value, i, octstr_len(value));
+	  wsp_pack_text(encoded, s);
+	  wsp_pack_value(os, encoded);
+	  
+	  octstr_destroy(s);
+     }
+     break;
+     
+     case MMS_HEADER_ATTRIBUTES:
+	  ch = mms_string_to_header(value);
+	  pack_short_integer(os, ch);
+	  break;
+	  	  
+     case MMS_HEADER_MBOX_TOTALS:
+     case MMS_HEADER_MBOX_QUOTAS:
+     {
+	  long i, l;
+	  
+	  i = octstr_parse_long(&l, value, 0, 10);
+	  if (i <0) {
+	       warning(0, "Bad quota value  for field %s!", mms_header_to_cstr(field_type));
+	       i = 0;
+	  }
+	  
+	  if (octstr_case_search(value, octstr_imm("bytes"), i) < 0)
+	       ch = 0x80;
+	  else
+	       ch = 0x81;
+	  pack_short_integer(encoded, ch);	  
+	  wsp_pack_integer_value(encoded, l);
+	  
+	  wsp_pack_value(os, encoded);
+     }
+     break;
+     
+     case MMS_HEADER_ELEMENT_DESCRIPTOR:
+     {
+	  Octstr *cv, *cpar;
+	  List *params;
+	  int i, n;
+	  
+	  split_header_value(value, &cv, &cpar);
+	  params = get_value_parameters(cpar);
+
+	  wsp_pack_text(encoded, cv);
+	  n = list_len(params);
+
+	  for (i = 0; i<n; i++) {
+	       Octstr *h, *v;
+	       int ch;
+	       http_header_get(params, i, &h, &v);
+	       ch = mms_string_to_descriptor_params(h);
+	       if (ch < 0)
+		    wsp_pack_text(encoded, h);
+	       else
+		    pack_short_integer(encoded, ch);
+
+	       ch = wsp_string_to_content_type(v);
+	       if (ch < 0)
+		    wsp_pack_text(encoded, v);
+	       else 
+		    pack_short_integer(encoded, ch);
+
+	       octstr_destroy(h);
+	       octstr_destroy(v);
+	  }
+	  	  
+	  octstr_destroy(cv);
+	  octstr_destroy(cpar);
+	  http_destroy_headers(params);
+
+	  wsp_pack_value(os, encoded);
+     }
+     break;
     default:
 	  warning(0, "MMS: Unknown header with code 0x%02x!", field_type);
     }
@ -989,7 +1224,7 @@ MmsMsg *mms_frommime(MIMEEntity *mime)
     }

     if ((s = http_header_value(m->headers, octstr_imm("X-Mms-MMS-Version"))) == NULL)
-	  http_header_add(m->headers, "X-Mms-MMS-Version", MMS_VERSION);
+	  http_header_add(m->headers, "X-Mms-MMS-Version", MMS_DEFAULT_VERSION);
     else
 	  octstr_destroy(s);    	
     
@ -1083,7 +1318,7 @@ MmsMsg *mms_deliveryreport(Octstr *msgid, Octstr *to, time_t date, Octstr *statu
     /* Now append headers. */
     
     http_header_add(m->headers, "X-Mms-Message-Type", "m-delivery-ind");
-     http_header_add(m->headers, "X-Mms-MMS-Version", MMS_VERSION);
+     http_header_add(m->headers, "X-Mms-MMS-Version", MMS_DEFAULT_VERSION);
     http_header_add(m->headers, "Message-ID", octstr_get_cstr(msgid));
     http_header_add(m->headers, "To", octstr_get_cstr(to));
     
@ -1114,7 +1349,7 @@ MmsMsg *mms_notification(MmsMsg *msg, unsigned int msize, Octstr *url,
     http_header_add(m->headers, "X-Mms-Message-Type", "m-notification-ind");
     http_header_add(m->headers, "X-Mms-Transaction-ID", 
 		     octstr_get_cstr(transactionid));
-     http_header_add(m->headers, "X-Mms-MMS-Version", MMS_VERSION);
+     http_header_add(m->headers, "X-Mms-MMS-Version", MMS_DEFAULT_VERSION);


 #define HX(h,d) do {\
@ -1171,7 +1406,7 @@ MmsMsg *mms_retrieveconf(MmsMsg *msg, Octstr *transactionid,
     if (transactionid)
 	  http_header_add(m->headers, "X-Mms-Transaction-ID", 
 			  octstr_get_cstr(transactionid));
-     http_header_add(m->headers, "X-Mms-MMS-Version", MMS_VERSION);
+     http_header_add(m->headers, "X-Mms-MMS-Version", MMS_DEFAULT_VERSION);

     if (!msg) {	  
 	  Octstr *x = date_format_http(time(NULL));
@ -1246,7 +1481,7 @@ MmsMsg *mms_sendconf(char *errstr, char *msgid, char *transid, int isforward)
 	  http_header_add(m->headers, "X-Mms-Message-Type", "m-forward-conf");
     }
     http_header_add(m->headers, "X-Mms-Transaction-ID", transid);
-     http_header_add(m->headers, "X-Mms-MMS-Version", MMS_VERSION);
+     http_header_add(m->headers, "X-Mms-MMS-Version", MMS_DEFAULT_VERSION);
     
     http_header_add(m->headers, "X-Mms-Response-Status", errstr);
     
--- a/mbuni/mmlib/mms_strings.def
+++ b/mbuni/mmlib/mms_strings.def
@ -78,6 +78,25 @@ VNSTRING(MS_1_1, "X-Mms-Reply-Charging-ID",MMS_HEADER_REPLY_CHARGING_ID)
 VNSTRING(MS_1_1, "X-Mms-Reply-Charging-Size",MMS_HEADER_REPLY_CHARGING_SIZE)
 VNSTRING(MS_1_1, "X-Mms-Previously-Sent-By",MMS_HEADER_PREVIOUSLY_SENT_BY)
 VNSTRING(MS_1_1, "X-Mms-Previously-Sent-Date",MMS_HEADER_PREVIOUSLY_SENT_DATE)
+
+VNSTRING(MS_1_2,"X-Mms-Store", MMS_HEADER_STORE)
+VNSTRING(MS_1_2,"X-Mms-MM-State", MMS_HEADER_MM_STATE)
+VNSTRING(MS_1_2,"X-Mms-MM-Flags", MMS_HEADER_MM_FLAGS)
+VNSTRING(MS_1_2,"X-Mms-Store-Status", MMS_HEADER_STORE_STATUS)
+VNSTRING(MS_1_2,"X-Mms-Store-Status-Text", MMS_HEADER_STORE_STATUS_TEXT)
+VNSTRING(MS_1_2,"X-Mms-Stored", MMS_HEADER_STORED)
+VNSTRING(MS_1_2,"X-Mms-Attributes", MMS_HEADER_ATTRIBUTES)
+VNSTRING(MS_1_2,"X-Mms-Totals", MMS_HEADER_TOTALS)
+VNSTRING(MS_1_2,"X-Mms-Mbox-Totals", MMS_HEADER_MBOX_TOTALS)
+VNSTRING(MS_1_2,"X-Mms-Quotas", MMS_HEADER_QUOTAS)
+VNSTRING(MS_1_2,"X-Mms-Mbox-Quotas", MMS_HEADER_MBOX_QUOTAS)
+VNSTRING(MS_1_2,"X-Mms-Message-Count", MMS_HEADER_MESSAGE_COUNT)
+VNSTRING(MS_1_2,"Content", CONTENT)
+VNSTRING(MS_1_2,"X-Mms-Start", MMS_HEADER_START)
+VNSTRING(MS_1_2,"Additional-headers", ADDITIONAL_HEADERS)
+VNSTRING(MS_1_2,"X-Mms-Distribution-Indicator", MMS_HEADER_DISTRIBUTION_INDICATOR)
+VNSTRING(MS_1_2,"X-Mms-Element-Descriptor", MMS_HEADER_ELEMENT_DESCRIPTOR)
+VNSTRING(MS_1_2,"X-Mms-Limit", MMS_HEADER_LIMIT)
 )

 LINEAR(reports,
@ -97,6 +116,16 @@ VNSTRING(MS_1_1,"m-read-rec-ind", MMS_MSGTYPE_READ_REC_IND)
 VNSTRING(MS_1_1,"m-read-orig-ind", MMS_MSGTYPE_READ_ORIG_IND)
 VNSTRING(MS_1_1,"m-forward-req", MMS_MSGTYPE_FORWARD_REQ)
 VNSTRING(MS_1_1,"m-forward-conf", MMS_MSGTYPE_FORWARD_CONF)
+
+VNSTRING(MS_1_2,"m-mbox-store-req",MMS_MSGTYPE_MBOX_STORE_REQ)
+VNSTRING(MS_1_2,"m-mbox-store-conf",MMS_MSGTYPE_MBOX_STORE_CONF)
+VNSTRING(MS_1_2,"m-mbox-view-req",MMS_MSGTYPE_MBOX_VIEW_REQ)
+VNSTRING(MS_1_2,"m-mbox-view-conf",MMS_MSGTYPE_MBOX_VIEW_CONF)
+VNSTRING(MS_1_2,"m-mbox-upload-req",MMS_MSGTYPE_MBOX_UPLOAD_REQ)
+VNSTRING(MS_1_2,"m-mbox-upload-conf",MMS_MSGTYPE_MBOX_UPLOAD_CONF)
+VNSTRING(MS_1_2,"m-mbox-delete-req",MMS_MSGTYPE_MBOX_DELETE_REQ)
+VNSTRING(MS_1_2,"m-mbox-delete-conf",MMS_MSGTYPE_MBOX_DELETE_CONF)
+VNSTRING(MS_1_2,"m-mbox-descr",MMS_MSGTYPE_MBOX_DESCR)
 )

 LINEAR(message_class,
@ -179,6 +208,28 @@ STRING("Forwarded")
 )


+LINEAR(mm_state,
+STRING("Draft")
+STRING("Sent")
+STRING("New")
+STRING("Retrieved")
+STRING("Forwarded")
+)
+
+NUMBERED(store_status, 
+ASSIGN("Success",128)
+ASSIGN("Error-transient-failure",192)
+ASSIGN("Error-transient-network-problem",193)
+ASSIGN("Error-permanent-failure",224)
+ASSIGN("Error-permanent-service-denied",225)
+ASSIGN("Error-permanent-message-format-corrupt",226)
+ASSIGN("Error-permanent-message-not-found",227)
+ASSIGN("Error-permanent-mmbox-full",228)
+)
+
+NUMBERED(descriptor_params,
+ASSIGN("type", 130)
+)

 #undef LINEAR
 #undef STRING
--- a/mbuni/mmlib/mms_strings.h
+++ b/mbuni/mmlib/mms_strings.h
@ -2,9 +2,10 @@
 #define __MMS_STRINGS_DEFINED__

 typedef enum {
-  MS_1_1 = 1
+  MS_1_1 = 1,
+  MS_1_2 = 2
 } mms_encoding;
-#define MMS_VERSION "1.0"
+#define MMS_DEFAULT_VERSION "1.0"
 /* Declare the functions */
 #define LINEAR(name, strings) \
 Octstr *mms_##name##_to_string(long number); \
--- a/mbuni/mmlib/mms_util.c
+++ b/mbuni/mmlib/mms_util.c
@ -437,35 +437,46 @@ List  *get_value_parameters(Octstr *params)
     return h;
 }

-int get_content_type(List *hdrs, Octstr **type, Octstr **params)
+int split_header_value(Octstr *value, Octstr **base_value, Octstr **params)
 {
-     
-     int i, n; 

-     
-     *type = http_header_find_first(hdrs, "Content-Type");	  
-     *params =NULL;
-
-     if (!*type) {
-	  *type = octstr_create("application/octet-stream");
-	  *params = octstr_create("");
-	  return -1;          
-     }
-     for (i = 0, n = octstr_len(*type); i < n; i++) {
-	  int c = octstr_get_char(*type, i);
+     int i, n;
+     for (i = 0, n = octstr_len(value); i < n; i++) {
+	  int c = octstr_get_char(value, i);

 	  if (c == ';')
 	       break;
 	  else if (c == '"') 
-	       i += http_header_quoted_string_len(*type, i) - 1;	  
+	       i += http_header_quoted_string_len(value, i) - 1;	  
     }
-     
+
+     *base_value = octstr_duplicate(value);     
     if (i < n) {
-	  *params = octstr_copy(*type, i+1, octstr_len(*type));
-	  octstr_delete(*type, i, octstr_len(*type));
+	  *params = octstr_copy(value, i+1, octstr_len(value));
+	  octstr_delete(*base_value, i, octstr_len(*base_value));
     } else 
 	  *params = octstr_create("");
+     return 0;
+
+}
+
+int get_content_type(List *hdrs, Octstr **type, Octstr **params)
+{
     
+     Octstr *v;
+     
+     v = http_header_find_first(hdrs, "Content-Type");	  
+     *params =NULL;
+
+     if (!v) {
+	  *type = octstr_create("application/octet-stream");
+	  *params = octstr_create("");
+	  return -1;          
+     }
+
+     split_header_value(v, type, params);
+
+     octstr_destroy(v);
     return 0;
 }

--- a/mbuni/mmlib/mms_util.h
+++ b/mbuni/mmlib/mms_util.h
@ -123,6 +123,8 @@ void mms_lib_init(void);
 /* get content type while stripping params. If any param is null, fails. */
 int get_content_type(List *hdrs, Octstr **type, Octstr **params);

+/* Takes a header value, returns the value proper and any parameters... */
+int split_header_value(Octstr *value, Octstr **base_value, Octstr **params);
 /* Returns a list of parameters as http_headers given the semi-comma delimited string.*/
 List  *get_value_parameters(Octstr *params);

--- a/mbuni/todo
+++ b/mbuni/todo
@ -1,6 +1,6 @@
 - correct handling of sender-visibility flag when receiving message (and also use correct address for billing. no spoofing).
 - Sending DLR correctly when sending from/to email.
 - In content adaptation: Colour depth adjustment
- logging a la access.log  (one log per interface -- mm1-log, mm4-log, etc)
 - Need to parameterise some values: tmp dir, response messages (say on failed content adaptation)
 - Tests
+- Correct handling of unrecognised mms headers. spec says pass them un-changed.