Added the Bu::FString::expand() function, which expands the string in place

using system variables and special tokens, such as ~name and ~/...

I like this, and think that it's ample precedent for adding things like
format(), formatAppend(), and formatPrepend(), which  would all rock.

1 files changed, 26 insertions, 0 deletions

diff --git a/src/fstring.h b/src/fstring.h
index 63e1e1a..9de6a56 100644
--- a/src/fstring.h
+++ b/src/fstring.h
@@ -4,6 +4,7 @@
 #include <stdint.h>
 #include <string>
 #include <memory>
+#include <wordexp.h>
 #include "bu/archival.h"
 #include "bu/archive.h"
 #include "bu/hash.h"
@@ -397,6 +398,31 @@ namespace Bu
                         append( pData, nSize );
                 }
 
+                void expand()
+                {
+                        flatten();
+
+                        wordexp_t result;
+
+                        /* Expand the string for the program to run.  */
+                        switch (wordexp (pFirst->pData, &result, 0))
+                        {
+                                case 0:                       /* Successful.  */
+                                        {
+                                                set( result.we_wordv[0] );
+                                                wordfree( &result );
+                                                return;
+                                        }
+                                        break;
+                                case WRDE_NOSPACE:
+                                        /* If the error was `WRDE_NOSPACE',
+                                        then perhaps part of the result was allocated.  */
+                                        wordfree (&result);
+                                default:                    /* Some other error.  */
+                                        return;
+                        }
+                }
+
                 /**
                  * Assignment operator.
                  *@param rSrc (const MyType &) The FString to set your FString to.