Skip to content

Added -f and -x switches (filter and exclude) #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ericcastro wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added -f and -x switches (filter and exclude) #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ static CFMutableDictionaryRef liveConnections;
static int debug;
static CFStringRef requiredDeviceId;
static char requiredProcessName[256];
static char includeOccurrences[256];
static char excludeOccurrences[256];
static void (*printMessage)(int fd, const char *, size_t);
static void (*printSeparator)(int fd);

Expand Down Expand Up @@ -67,6 +69,15 @@ static unsigned char should_print_message(const char *buffer, size_t length)

// More filtering options can be added here and return 0 when they won't meed filter criteria

if (strlen(includeOccurrences) && !strstr(buffer, includeOccurrences))
{
return 0;
}

if (strlen(excludeOccurrences) && strstr(buffer, excludeOccurrences))
{
return 0;
}
return 1;

}
Expand Down Expand Up @@ -277,14 +288,14 @@ static void color_separator(int fd)
int main (int argc, char * const argv[])
{
if ((argc == 2) && (strcmp(argv[1], "--help") == 0)) {
fprintf(stderr, "Usage: %s [options]\nOptions:\n -d\t\t\tInclude connect/disconnect messages in standard out\n -u <udid>\t\tShow only logs from a specific device\n -p <process name>\tShow only logs from a specific process\n\nControl-C to disconnect\nMail bug reports and suggestions to <ryan.petrich@medialets.com>\n", argv[0]);
fprintf(stderr, "Usage: %s [options]\nOptions:\n -d\t\t\tInclude connect/disconnect messages in standard out\n -u <udid>\t\tShow only logs from a specific device\n -p <process name>\tShow only logs from a specific process\n -f <keyword>\tFilter output that contain occurrences of <keyword> (include)\n -x <keyword>\tFilter output that doesn't contain occurrences of <keyword> (exclude)\n\nControl-C to disconnect\nMail bug reports and suggestions to <ryan.petrich@medialets.com>\n", argv[0]);
return 1;
}
int c;
bool use_separators = false;
bool force_color = false;
memset(requiredProcessName, '\0', 256);
while ((c = getopt(argc, argv, "dcsu:p:")) != -1)
while ((c = getopt(argc, argv, "dcsu:p:f:x:")) != -1)
switch (c)
{
case 'd':
Expand All @@ -304,6 +315,12 @@ int main (int argc, char * const argv[])
case 'p':
strcpy(requiredProcessName, optarg);
break;
case 'f':
strcpy(includeOccurrences, optarg);
break;
case 'x':
strcpy(excludeOccurrences, optarg);
break;
case '?':
if (optopt == 'u')
fprintf(stderr, "Option -%c requires an argument.\n", optopt);
Expand Down