Added -f "file" option.

Author: duncansmart

ReadMe.md

@@ -8,14 +8,15 @@ A command-line utilty that does local SQL Server backups/restores to STDOUT/STDI
     Options:
       -q Quiet, don't print messages to STDERR
       -i "instancename"
+      -f "file" Write/read file instead of STDOUT/STDIN
 
 ## Examples ##
 
 Basic backup:
 
     sqlpipe backup AdventureWorks > AdventureWorks.bak
 
-Backup with named intance SQLEXPRESS:
+Backup from named instance SQLEXPRESS:
 
     sqlpipe backup AdventureWorks -i SQLEXPRESS > AdventureWorks.bak
 
@@ -37,11 +38,19 @@ Restore gzip compressed database (assumes 7-Zip's 7z.exe is in `%PATH%`):
 
 ## Remote SQL Servers ##
 
-SqlPipe itself can only connect to a local SQL Server, but by using something like Sysinternals' PSExec you can execute it remotely like so:
+SqlPipe itself can only connect to a local SQL Server, but by using something like [Sysinternals PSExec](http://technet.microsoft.com/en-us/sysinternals/bb897553) you can execute it remotely like so:
 
-    psexec \\myserver -c sqlpipe backup AdventureWorks > C:\Backups\AdventureWorks.bak
+    psexec \\dbserver -cv sqlpipe backup AdventureWorks > C:\Backups\AdventureWorks.bak
 
-Note that in this example that `C:\Backups\Inventory.bak` refers to a location on *your* machine not the remote server. Yes, the backup data was piped over the network!
+Note that in this example that `C:\Backups\Inventory.bak` refers to a location on *your* machine not the remote server. Yes, the backup data was piped over the network! 
+
+To write to a remote file locaton use the `-f` option:
+
+    psexec \\dbserver -cv sqlpipe backup AdventureWorks -f C:\Backups\AdventureWorks.bak
+
+Or a central network location:
+
+    psexec \\dbserver -u domain\user -p P@55w0rd -cv sqlpipe backup AdventureWorks -f \\fileserver\Backups\AdventureWorks.bak
 
 ## Implementation details ##
 

SqlPipe.cpp

@@ -202,24 +202,30 @@ Action and database required.\n\
 Usage: sqlpipe backup|restore <database> [options]\n\
 Options:\n\
   -q Quiet, don't print messages to STDERR\n\
-  -i instancename\n");
+  -i \"instancename\"\n\
+  -f \"file\" Write/read file instead of STDOUT/STDIN\n");
 		return 1;
 	}
 
-	TCHAR* command = argv[1];
+	TCHAR* command = _wcslwr(argv[1]);
 	TCHAR* databaseName = argv[2];
 
+	TCHAR* filePath = NULL;
+
 	// Parse options
 	for (int i = 0; i < argc; i++)
 	{
-		
 		TCHAR* arg = _wcslwr(_wcsdup(argv[i]));
+
 		if (wcscmp(arg, L"-q") == 0)
 			_optionQuiet = true;
 
 		if (wcscmp(arg, L"-i") == 0)
 			_serverInstanceName = argv[i+1];
 
+		if (wcscmp(arg, L"-f") == 0)
+			filePath = argv[i+1];
+
 		free(arg);
 	}
 
@@ -278,30 +284,51 @@ Options:\n\
 	}
 
 	TCHAR* sql;
-	FILE* backupFile;
-	if (_wcsicmp(command, L"backup") == 0)
+	FILE* backupFile = NULL;
+	if (wcscmp(command, L"backup") == 0)
 	{
 		sql = "BACKUP DATABASE [" + _bstr_t(databaseName) + "] TO VIRTUAL_DEVICE = '" + virtualDeviceName + "'";
-		backupFile = stdout;
+		if (filePath == NULL)
+			backupFile = stdout;
+		else
+		{
+			backupFile = _wfopen(filePath, L"w");
+			if (backupFile == NULL)
+			{
+				err(L"Error creating '%s': %s\n", filePath, _wcserror(errno));
+				return errno;
+			}
+		}
 	}
-	else if(_wcsicmp(command, L"restore") == 0)
+	else if(wcscmp(command, L"restore") == 0)
 	{
 		hr = executeSql("CREATE DATABASE ["+ _bstr_t(databaseName) +"]");
 		if (FAILED(hr))
 			return hr;
 
 		sql = "RESTORE DATABASE [" + _bstr_t(databaseName) + "] FROM VIRTUAL_DEVICE = '" + virtualDeviceName + "' WITH REPLACE";
-		backupFile = stdin;
+		if (filePath == NULL)
+			backupFile = stdin;
+		else
+		{
+			backupFile = _wfopen(filePath, L"r");
+			if (backupFile == NULL)
+			{
+				err(L"Error opening '%s': %s\n", filePath, _wcserror(errno));
+				return errno;
+			}
+		}
 	}
 	else 
 	{
 		err(L"Unsupported command '%s': only BACKUP or RESTORE are supported.\n", command);
 		return 1;
 	}
 
+	
 	// Invoke backup on separate thread because virtualDeviceSet->GetConfiguration will block until "BACKUP DATABASE..."
 	DWORD threadId;
-	HANDLE executeSqlThread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)&executeSql, (TCHAR*)sql, 0, &threadId);
+	HANDLE executeSqlThread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)&executeSql, sql, 0, &threadId);
 
 	// Ready...
 	hr = virtualDeviceSet->GetConfiguration(30000, &vdConfig);
@@ -329,7 +356,7 @@ Options:\n\
 	}
 
 	// Go
-	_setmode(_fileno(backupFile), _O_BINARY);
+	_setmode(_fileno(backupFile), _O_BINARY); //ensure \n's in STDOUT don't get tampered with
 	hr = performTransfer(virtualDevice, backupFile);
 
 	WaitForSingleObject(executeSqlThread, 5000);